summaryrefslogtreecommitdiff
path: root/chrome
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-12-15 19:37:20 -0200
committerdrebs <drebs@leap.se>2013-12-20 14:58:55 -0200
commit292945655ea4be295221d179530b98e4f391c726 (patch)
tree123833fe881ad195c1b1d0cbfe19406647f72d85 /chrome
parent8138d21582cfb43fd7462560e858e71ce2c9a9c3 (diff)
Remove misleading encryption info from wizard (#4545).
Diffstat (limited to 'chrome')
-rw-r--r--chrome/content/accountWizard/accountWizard.js16
-rw-r--r--chrome/content/accountWizard/accountWizard.xul2
-rw-r--r--chrome/locale/en-US/accountWizard.properties2
3 files changed, 13 insertions, 7 deletions
diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js
index 1e25d0f..35dae00 100644
--- a/chrome/content/accountWizard/accountWizard.js
+++ b/chrome/content/accountWizard/accountWizard.js
@@ -28,6 +28,7 @@ Cu.import("resource:///modules/gloda/log4moz.js");
let gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
var gStringsBundle;
+var gAccountWizardStringsBundle;
var gBrandShortName;
function e(elementID)
@@ -125,6 +126,7 @@ BitmaskAccountWizard.prototype =
gEmailWizardLogger.info("Email account setup dialog loaded.");
gStringsBundle = e("accountCreationStrings");
+ gAccountWizardStringsBundle = e("accountWizardStrings");
gBrandShortName = e("bundle_brand").getString("brandShortName");
// admin-locked prefs hurray
@@ -463,13 +465,13 @@ BitmaskAccountWizard.prototype =
unknownString);
let host = server.hostname +
(isStandardPort(server.port) ? "" : ":" + server.port);
- let ssl = gStringsBundle.getString(sanitize.translate(server.socketType,
- { 1 : "resultNoEncryption", 2 : "resultSSL", 3 : "resultSTARTTLS" }),
- unknownString);
- let certStatus = gStringsBundle.getString(server.badCert ?
- "resultSSLCertWeak" : "resultSSLCertOK");
- return gStringsBundle.getFormattedString(stringName,
- [ type, host, ssl, certStatus ]);
+ //let ssl = gStringsBundle.getString(sanitize.translate(server.socketType,
+ // { 1 : "resultNoEncryption", 2 : "resultSSL", 3 : "resultSTARTTLS" }),
+ // unknownString);
+ //let certStatus = gStringsBundle.getString(server.badCert ?
+ // "resultSSLCertWeak" : "resultSSLCertOK");
+ return gAccountWizardStringsBundle.getFormattedString(stringName,
+ [ type, host ]);
};
var incomingResult = unknownString;
diff --git a/chrome/content/accountWizard/accountWizard.xul b/chrome/content/accountWizard/accountWizard.xul
index 6518f83..1587c50 100644
--- a/chrome/content/accountWizard/accountWizard.xul
+++ b/chrome/content/accountWizard/accountWizard.xul
@@ -33,6 +33,8 @@
src="chrome://branding/locale/brand.properties"/>
<stringbundle id="accountCreationStrings"
src="chrome://messenger/locale/accountCreation.properties"/>
+ <stringbundle id="accountWizardStrings"
+ src="chrome://bitmask/locale/accountWizard.properties"/>
</stringbundleset>
<script type="application/javascript"
src="chrome://bitmask/content/serverConfig.js"/>
diff --git a/chrome/locale/en-US/accountWizard.properties b/chrome/locale/en-US/accountWizard.properties
index 51532d0..f91fc70 100644
--- a/chrome/locale/en-US/accountWizard.properties
+++ b/chrome/locale/en-US/accountWizard.properties
@@ -1,2 +1,4 @@
# verifyConfig.js
cannot_login.error=Unable to log in at server. Probably wrong configuration, username or password.
+resultIncoming=%1$S, %2$S
+resultOutgoing=%1$S, %2$S