diff --git a/resources/static/include_js/include.js b/resources/static/include_js/include.js index bb50fee32d1277c2d643a6a2cbd0b626b5342bf0..86eacc90ec798330152a9d7df574054d0ae14972 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 bb0b665454977f9e0d490aa99520f5828d6c7cab..b8957bd23a39b07b60d24c19682c49ba55ff5207 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 b6f8bd3ba60528bef073e5ee23cec04a976ba9e3..eba9ac11d110949b2d0f8f262271bb5eba4ed24b 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>