Remove misleading encryption info from wizard (#4545).

diff --git a/changes/feature_4545_remove-misleading-encryption-information-from-wizard b/changes/feature_4545_remove-misleading-encryption-information-from-wizard
new file mode 100644 (file)
index 0000000..8286cfd
--- /dev/null
+++ b/changes/feature_4545_remove-misleading-encryption-information-from-wizard
@@ -0,0 +1 @@
+  o Remove misleading encryption information from wizard (#4545).

diff --git a/chrome/content/accountWizard/accountWizard.js b/chrome/content/accountWizard/accountWizard.js
index 1e25d0f..35dae00 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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