Commit 51f7139d authored by Steve Armand's avatar Steve Armand
Browse files

Bug 1390644 - Change the mid-sync state of "Syncing…" to "Syncing Tabs…". r=eoger 

MozReview-Commit-ID: Ef1aWhWEnZh

--HG--
extra : rebase_source : 458685d94d16acfb21d080287484869c93d7a091
parent a4c89351

browser/base/content/browser-sync.js

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ var gSync = { 


    let broadcaster = document.getElementById("sync-status");

    broadcaster.setAttribute("syncstatus", "active");

    broadcaster.setAttribute("label", this.syncStrings.GetStringFromName("syncing2.label"));

    broadcaster.setAttribute("label", this.syncStrings.GetStringFromName("syncingtabs.label"));

    broadcaster.setAttribute("disabled", "true");

  },

browser/base/content/test/sync/browser_sync.js

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ function checkSyncNowButton(buttonId, syncing, tooltip = null) { 


  is(remoteTabsButton.hasAttribute("disabled"), syncing, "disabled has the right value");

  if (syncing) {

    is(remoteTabsButton.getAttribute("label"), gSync.syncStrings.GetStringFromName("syncing2.label"), "label is set to the right value");

    is(remoteTabsButton.getAttribute("label"), gSync.syncStrings.GetStringFromName("syncingtabs.label"), "label is set to the right value");

  } else {

    is(remoteTabsButton.getAttribute("label"), gSync.syncStrings.GetStringFromName("syncnow.label"), "label is set to the right value");

  }

services/sync/locales/en-US/sync.properties

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ lastSync2.label = Last sync: %S 
signInToSync.description = Sign In To Sync



syncnow.label = Sync Now

syncing2.label = Syncing…
 
syncingtabs.label = Syncing Tabs…