diff options
| author | drebs <drebs@leap.se> | 2014-03-12 10:15:09 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2014-03-13 11:52:25 -0300 |
| commit | 80f0f5728edb2d0cff7934c994e795316b526f6f (patch) | |
| tree | 09489ff7327adf4f8b8c279f52870a2cc3d2ffda | |
| parent | 10a255d318d3126cbd10fe1b0c8284a223850603 (diff) | |
Fix error string on new account setup (#5193).
| -rw-r--r-- | chrome/content/accountWizard/accountWizard.js | 12 | ||||
| -rw-r--r-- | chrome/content/accountWizard/accountWizard.xul | 2 | ||||
| -rw-r--r-- | chrome/locale/en-US/accountWizard.properties | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js index 35dae00..c3f8887 100644 --- a/chrome/content/accountWizard/accountWizard.js +++ b/chrome/content/accountWizard/accountWizard.js @@ -405,14 +405,14 @@ BitmaskAccountWizard.prototype = { e("status_area").setAttribute("status", "loading"); gEmailWizardLogger.warn("spinner start " + actionStrName); - this._showStatusTitle(actionStrName); + this._showStatusTitle(actionStrName, gStringsBundle); }, stopSpinner : function(actionStrName) { e("status_area").setAttribute("status", "result"); _hide("stop_button"); - this._showStatusTitle(actionStrName); + this._showStatusTitle(actionStrName, gStringsBundle); gEmailWizardLogger.warn("all spinner stop " + actionStrName); }, @@ -420,15 +420,15 @@ BitmaskAccountWizard.prototype = { e("status_area").setAttribute("status", "error"); gEmailWizardLogger.warn("status error " + actionStrName); - this._showStatusTitle(actionStrName); + this._showStatusTitle(actionStrName, gAccountWizardStringsBundle); }, - _showStatusTitle : function(msgName) + _showStatusTitle : function(msgName, bundle) { let msg = " "; // assure height. Do via min-height in CSS, for 2 lines? try { if (msgName) { - msg = gStringsBundle.getFormattedString(msgName, [gBrandShortName]); + msg = bundle.getFormattedString(msgName, [gBrandShortName]); } } catch(ex) { gEmailWizardLogger.error("missing string for " + msgName); @@ -687,7 +687,7 @@ BitmaskAccountWizard.prototype = self.showErrorStatus("config_unverifiable"); // TODO bug 555448: wrong error msg, there may be a 1000 other // reasons why this failed, and this is misleading users. - self.setError("passworderror", "user_pass_invalid"); + //self.setError("passworderror", "user_pass_invalid"); // TODO use switchToMode(), see above // give user something to proceed after fixing _enable("create_button"); diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul index 1587c50..12b4d17 100644 --- a/chrome/content/accountWizard/accountWizard.xul +++ b/chrome/content/accountWizard/accountWizard.xul @@ -145,7 +145,7 @@ <hbox id="status_area" flex="1"> <vbox id="status_img_before" pack="start"/> - <description id="status_msg"> </description> + <description id="status_msg" style="white-space: pre-wrap;"> </description> <!-- Include 160 = nbsp, to make the element occupy the full height, for at least one line. With a normal space, it does not have sufficient height. --> diff --git a/chrome/locale/en-US/accountWizard.properties b/chrome/locale/en-US/accountWizard.properties index f91fc70..3a12f78 100644 --- a/chrome/locale/en-US/accountWizard.properties +++ b/chrome/locale/en-US/accountWizard.properties @@ -1,4 +1,7 @@ # verifyConfig.js cannot_login.error=Unable to log in at server. Probably wrong configuration, username or password. + +# accountWizard.js resultIncoming=%1$S, %2$S resultOutgoing=%1$S, %2$S +config_unverifiable=Configuration could not be verified - are you logged into\nBitmask with the correct username? |