Bug 1518155 - Follow-up: Rename some strings to avoid duplication. r=me DONTBUILD
authorJorg K <jorgk@jorgk.com>
Fri, 11 Jan 2019 10:30:13 +0100
changeset 34163 389458d074704c6ce013eab6ab506c998c7b691d
parent 34162 0c6c2007dfae49051206ba3e52a1fbf14f89d608
child 34164 6c36a1eb832351416d0a9e6ff513ce9f1745aa43
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersme
bugs1518155
Bug 1518155 - Follow-up: Rename some strings to avoid duplication. r=me DONTBUILD
mail/components/accountcreation/content/emailWizard.js
mail/components/accountcreation/content/emailWizard.xul
mail/locales/en-US/chrome/messenger/accountCreation.dtd
--- a/mail/components/accountcreation/content/emailWizard.js
+++ b/mail/components/accountcreation/content/emailWizard.js
@@ -448,17 +448,17 @@ EmailConfigWizard.prototype =
   },
 
   onInputRealname() {
     this._realname = e("realname").value;
     this.checkStartDone();
   },
 
   onInputUsername() {
-    this._exchangeUsername = e("username").value;
+    this._exchangeUsername = e("usernameEx").value;
     this.checkStartDone();
   },
 
   onInputPassword() {
     this._password = e("password").value;
     this.checkStartDone();
   },
 
--- a/mail/components/accountcreation/content/emailWizard.xul
+++ b/mail/components/accountcreation/content/emailWizard.xul
@@ -197,26 +197,26 @@
           <checkbox id="remember_password"
                     label="&rememberPassword.label;"
                     accesskey="&rememberPassword.accesskey;"
                     checked="true"/>
         </row>
         <row id="usernameRow" align="center" hidden="true">
           <!-- This is used only used for Exchange AutoDiscover, and even then
                only when absolutely necessary and known to be needed. -->
-          <label accesskey="&username.accesskey;"
+          <label accesskey="&usernameEx.accesskey;"
                  class="autoconfigLabel"
-                 value="&username.label;"
-                 control="username"/>
-          <textbox id="username"
+                 value="&usernameEx.label;"
+                 control="usernameEx"/>
+          <textbox id="usernameEx"
                    class="padded"
-                   placeholder="&username.placeholder;"
+                   placeholder="&usernameEx.placeholder;"
                    oninput="gEmailConfigWizard.onInputUsername();" />
           <hbox>
-            <description id="usernametext" class="initialDesc">&username.text;</description>
+            <description id="usernametextEx" class="initialDesc">&usernameEx.text;</description>
           </hbox>
         </row>
       </rows>
     </grid>
     <spacer flex="1" />
 
     <hbox id="status_area" flex="1">
       <vbox id="status_img_before" pack="start"/>
--- a/mail/locales/en-US/chrome/messenger/accountCreation.dtd
+++ b/mail/locales/en-US/chrome/messenger/accountCreation.dtd
@@ -13,22 +13,22 @@
 <!ENTITY email2.placeholder              "you@example.com">
 <!ENTITY email.text                      "Your existing email address">
 <!ENTITY password.label                  "Password:">
 <!ENTITY password.accesskey              "P">
 <!ENTITY password.placeholder            "Password">
 <!ENTITY password.text                   "Optional, will only be used to validate the username">
 <!ENTITY rememberPassword.label          "Remember password">
 <!ENTITY rememberPassword.accesskey      "m">
-<!ENTITY username.label                  "Your login:">
-<!ENTITY username.accesskey              "l">
-<!-- LOCALIZATION NOTE(username.placeholder): YOURDOMAIN refers to the Windows domain in ActiveDirectory. yourusername refers to the user's account name in Windows. -->
-<!ENTITY username.placeholder            "YOURDOMAIN\yourusername">
-<!-- LOCALIZATION NOTE(username.text): Domain refers to the Windows domain in ActiveDirectory. We mean the user's login in Windows at the local corporate network. -->
-<!ENTITY username.text                   "Domain login">
+<!ENTITY usernameEx.label                "Your login:">
+<!ENTITY usernameEx.accesskey            "l">
+<!-- LOCALIZATION NOTE(usernameEx.placeholder): YOURDOMAIN refers to the Windows domain in ActiveDirectory. yourusername refers to the user's account name in Windows. -->
+<!ENTITY usernameEx.placeholder          "YOURDOMAIN\yourusername">
+<!-- LOCALIZATION NOTE(usernameEx.text): Domain refers to the Windows domain in ActiveDirectory. We mean the user's login in Windows at the local corporate network. -->
+<!ENTITY usernameEx.text                 "Domain login">
 
 <!ENTITY imapLong.label                  "IMAP (remote folders)">
 <!ENTITY pop3Long.label                  "POP3 (keep mail on your computer)">
 
 <!ENTITY incoming.label                  "Incoming:">
 <!ENTITY outgoing.label                  "Outgoing:">
 <!ENTITY username.label                  "Username:">
 <!ENTITY hostname.label                  "Server hostname">