Bug 1225431 - revice l10 String to fxsync-sign-out and fxsync-confirm…

…-sign-out. r=seanlee, a=jocheng
mozilla-b2g · Nov 30, 2015 · e333b79 · e333b79
1 parent dff0160
commit e333b79
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/tv_apps/browser/index.html b/tv_apps/browser/index.html
@@ -733,7 +733,7 @@ <h1 id="private-browsing-subtitle-text" data-l10n-id="WB_LT_PRIVATE_BROWSING_1">
             <div id="fxsync-enabled" hidden>
               <span id="fxsync-signed-in-as" data-l10n-id="fxsync-signed-in-as"></span>
               <smart-button id="fxsync-sync-now-button" type="rounded-corner-text" data-l10n-id="fxsync-sync-now"></smart-button>
-              <smart-button id="fxsync-sign-out-button" type="rounded-corner-text" data-l10n-id="fxsync-disconnect"></smart-button>
+              <smart-button id="fxsync-sign-out-button" type="rounded-corner-text" data-l10n-id="fxsync-sign-out"></smart-button>
               <ul class="settings-horizontal-list">
                 <li class="settings-horizontal-list-item">
                   <input type="checkbox" id="fxsync-collection-bookmarks" class="settings-list-checkbox"></input>

diff --git a/tv_apps/browser/js/browser_dialog.js b/tv_apps/browser/js/browser_dialog.js
@@ -170,9 +170,9 @@ var BrowserDialog = {
       case 'signout_confirm':
         opt = {
           title: null,
-          msg: _('fxsync-confirm-disconnect'),
+          msg: _('fxsync-confirm-sign-out'),
           bt1: _('LT_CANCEL'),
-          bt2: _('fxsync-disconnect')
+          bt2: _('fxsync-sign-out')
         };
         var deferred = {};
         deferred.promise = new Promise(function(resolve, reject) {

diff --git a/tv_apps/browser/locales/browser.en-US.properties b/tv_apps/browser/locales/browser.en-US.properties
@@ -95,8 +95,8 @@ pocket=Pocket
 
 # Firefox Sync
 fxsync-sign-in=Sign In
-fxsync-disconnect=Disconnect
-fxsync-confirm-disconnect=Are you sure? Your synced Firefox bookmarks and history will no longer be available on this TV until you sign in again.
+fxsync-sign-out=Sign Out
+fxsync-confirm-sign-out=Are you sure? Your synced Firefox bookmarks and history will no longer be available on this TV until you sign in again.
 fxsync-signed-in-as={{email}}
 fxsync-sign-in-to-sync=Sign in to Sync
 fxsync-sign-in-to-sync-description=Get your bookmarks and history from your Firefox devices

diff --git a/tv_apps/browser/test/unit/browser_dialog_test.js b/tv_apps/browser/test/unit/browser_dialog_test.js
@@ -76,15 +76,15 @@ suite('Browser Dialog >', function() {
          function(done) {
       promise = subject.createDialog('signout_confirm');
       expect(subject.browserDialogMsg.innerHTML)
-        .to.equals('fxsync-confirm-disconnect');
+        .to.equals('fxsync-confirm-sign-out');
       expect(subject.browserDialogButton1.textContent)
         .to.equals('LT_CANCEL');
       expect(subject.browserDialogButton1.dataset.type)
         .to.equals('signout_confirm');
       expect(subject.browserDialogButton1.classList.contains('visible'))
         .to.equals(true);
       expect(subject.browserDialogButton2.textContent)
-        .to.equals('fxsync-disconnect');
+        .to.equals('fxsync-sign-out');
       expect(subject.browserDialogButton2.dataset.type)
         .to.equals('signout_confirm');
       expect(subject.browserDialogButton2.classList.contains('visible'))

diff --git a/tv_apps/browser/test/unit/sync/fixtures/settings.html b/tv_apps/browser/test/unit/sync/fixtures/settings.html
@@ -9,7 +9,7 @@
   <div id="fxsync-enabled">
     <span id="fxsync-signed-in-as" data-l10n-id="fxsync-signed-in-as"></span>
     <smart-button id="fxsync-sync-now-button" type="simple-text" data-l10n-id="fxsync-sync-now"></smart-button>
-    <smart-button id="fxsync-sign-out-button" type="simple-text" data-l10n-id="fxsync-disconnect">Disconnect</smart-button>
+    <smart-button id="fxsync-sign-out-button" type="simple-text" data-l10n-id="fxsync-sign-out"></smart-button>
     <ul class="settings-horizontal-list">
       <li class="settings-horizontal-list-item">
         <input type="checkbox" id="fxsync-collection-bookmarks" ></input>

diff --git a/tv_apps/browser/test/unit/sync/settings_test.js b/tv_apps/browser/test/unit/sync/settings_test.js
@@ -208,7 +208,7 @@ suite('Sync settings >', function() {
     test('should show signout button', function() {
       expect(subject.elements.signOutButton).to.be.an('object');
       expect(subject.elements.signOutButton.getAttribute('data-l10n-id'))
-        .to.equals('fxsync-disconnect');
+        .to.equals('fxsync-sign-out');
     });
 
     test('should show collection switches', function() {