Bug 967821 Visual/copy bugs in fxa settings app menu item

Author: jaredhirsch

apps/settings/js/firefox_accounts.js

@@ -136,9 +136,11 @@ var FxaMenu = (function fxa_menu() {
         email: Normalizer.escapeHTML(email)
       });
     } else if (state == 'unverified') {
-      navigator.mozL10n.localize(menuDesc, 'fxa-check-email');
+      navigator.mozL10n.localize(menuDesc, 'fxa-check-email', {
+        email: Normalizer.escapeHTML(email)
+      });
     } else { // state == 'loggedout'
-      menuDesc.textContent = '';
+      navigator.mozL10n.localize(menuDesc, 'fxa-login');
     }
   }
 
@@ -200,7 +202,8 @@ var FxaPanel = (function fxa_panel() {
 
   function onFxAccountStateChange(data) {
     var state = data.state,
-      email = Normalizer.escapeHTML(data.email);
+      //email = Normalizer.escapeHTML(data.email);
+      email = data.email;
 
     if (state == 'verified') {
       showSpinner();
@@ -238,7 +241,8 @@ var FxaPanel = (function fxa_panel() {
 
   function showLoggedInPanel(email) {
     navigator.mozL10n.localize(loggedInEmail, 'fxa-logged-in-text', {
-      email: '<em>' + email + '</em>'
+      // email: '<em>' + email + '</em>'
+      email: email
     });
     loggedInPanel.hidden = false;
     logoutBtn.onclick = _fxaModel.onLogoutClick;
@@ -252,7 +256,8 @@ var FxaPanel = (function fxa_panel() {
   function showUnverifiedPanel(email) {
     unverifiedPanel.hidden = false;
     navigator.mozL10n.localize(unverifiedEmail, 'fxa-verification-email-sent', {
-      email: '<em>' + email + '</em>'
+      // email: '<em>' + email + '</em>'
+      email: email
     });
   }
 

apps/settings/locales/settings.en-US.properties

@@ -620,7 +620,7 @@ defaultKeyboardEnabled={{appName}} {{layoutName}} is set as default input method
 #=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
 
 fxa=Firefox Accounts
-accounts=Accounts
+accounts=Account Management
 fxa-accounts=Firefox Accounts
 
 # Panel: logged out
@@ -635,15 +635,15 @@ fxa-how-to-access=You can access and manage your account from your phone’s set
 
 # Panel: logged in, verified
 fxa-myaccount=My Account
-fxa-logged-in-text=Logged in as {{email}}.
+fxa-logged-in-text=Signed in as {{email}}
 fxa-registered-apps-header=Registered Apps
 fxa-marketplace-app=Marketplace
 fxa-wheres-my-fox-app=Where’s My Fox
 fxa-account-options=Account Options
 fxa-logout=Log Out
 
 # Additional menu states
-fxa-check-email=Please check your email.
+fxa-check-email=Please verify {{email}}
 
 
 #=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#