From 5458b18087c482d2b5a8b6ff12174d3744c3d31d Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 15 Feb 2012 14:04:09 +0000
Subject: [PATCH] Clarify error codes for unsupported browsers. Shorten text
in "cookies disabled" screen.
issue #835
---
resources/static/include_js/include.js | 8 ++++----
resources/static/shared/error-messages.js | 4 ++--
resources/views/cookies_disabled.ejs | 7 ++-----
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/resources/static/include_js/include.js b/resources/static/include_js/include.js
index bb50fee32..86eacc90e 100644
--- a/resources/static/include_js/include.js
+++ b/resources/static/include_js/include.js
@@ -831,7 +831,7 @@
ieNosupport = ieVersion > -1 && ieVersion < 8;
if(ieNosupport) {
- return "IE_VERSION";
+ return "BAD_IE_VERSION";
}
}
@@ -863,7 +863,7 @@
}
else {
// Browser does not have local storage.
- return "LOCALSTORAGE";
+ return "LOCALSTORAGE_MISSING";
}
} catch(e) {
return "LOCALSTORAGE_DISABLED";
@@ -872,13 +872,13 @@
function checkPostMessage() {
if(!win.postMessage) {
- return "POSTMESSAGE";
+ return "POSTMESSAGE_MISSING";
}
}
function checkJSON() {
if(!(window.JSON && window.JSON.stringify && window.JSON.parse)) {
- return "JSON";
+ return "JSON_MISSING";
}
}
diff --git a/resources/static/shared/error-messages.js b/resources/static/shared/error-messages.js
index bb0b66545..b8957bd23 100644
--- a/resources/static/shared/error-messages.js
+++ b/resources/static/shared/error-messages.js
@@ -46,8 +46,8 @@ BrowserID.Errors = (function(){
},
cookiesDisabled: {
- title: gettext("We are sorry, BrowserID requires cookies"),
- message: gettext("BrowserID requires your browser's cookies to be enabled to operate. Please enable your browser's cookies and try again")
+ title: gettext("BrowserID requires cookies"),
+ message: gettext("Please close this window, <a target='_blank' href='http://support.mozilla.org/en-US/kb/Websites%20say%20cookies%20are%20blocked'>enable cookies</a> and try again")
},
cookiesEnabled: {
diff --git a/resources/views/cookies_disabled.ejs b/resources/views/cookies_disabled.ejs
index b6f8bd3ba..eba9ac11d 100644
--- a/resources/views/cookies_disabled.ejs
+++ b/resources/views/cookies_disabled.ejs
@@ -6,14 +6,11 @@
<div class="table">
<div class="vertical contents">
<h2 id="reason">
- <%= gettext("We are sorry, BrowserID requires cookies") %>
+ <%= gettext("BrowserID requires cookies") %>
</h2>
<p>
- <%= gettext("BrowserID requires your browser's cookies to be enabled to operate. Please enable your browser's cookies and try again") %>
- </p>
- <p>
- <%= gettext("To retry, you will have to close this window and try again.") %>
+ <%- gettext("Please close this window, <a target='_blank' href='http://support.mozilla.org/en-US/kb/Websites%20say%20cookies%20are%20blocked'>enable cookies</a> and try again") %>
</p>
</div>
</div>
--
GitLab