Bug 1390644 - Change the mid-sync state of "Syncing…" to "Syncing Tabs…". r?eoger
MozReview-Commit-ID: Ef1aWhWEnZh
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -487,17 +487,17 @@ var gSync = {
// Functions called by observers
onActivityStart() {
clearTimeout(this._syncAnimationTimer);
this._syncStartTime = Date.now();
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");
},
_onActivityStop() {
if (!gBrowser)
return;
let broadcaster = document.getElementById("sync-status");
broadcaster.removeAttribute("syncstatus");
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -193,17 +193,17 @@ function checkSyncNowButton(buttonId, sy
}
if (buttonId.endsWith("-fxa-icon")) {
return;
}
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");
}
}
// Only one item visible at a time.
function checkItemsVisiblities(itemsIds, expectedShownItemId) {
for (let id of itemsIds) {
--- a/services/sync/locales/en-US/sync.properties
+++ b/services/sync/locales/en-US/sync.properties
@@ -8,9 +8,9 @@ client.name2 = %1$S’s %2$S on %3$S
# %S is the date and time at which the last sync successfully completed
lastSync2.label = Last sync: %S
# signInToSync.description is the tooltip for the Sync buttons when Sync is
# not configured.
signInToSync.description = Sign In To Sync
syncnow.label = Sync Now
-syncing2.label = Syncing…
+syncingtabs.label = Syncing Tabs…