Backed out changeset e61b2935e9d5 (bug 1581426) for bc failures at browser_protections_lockwise.js. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Fri, 15 Nov 2019 22:20:46 +0200
changeset 502280 c162ad97808da1fb11dba53934534d1f4771f082
parent 502279 8d60ae80f33b8f88e947b17b34d89b384bb472c8
child 502281 c1c84c2869be73727aa38e6220792aa83cb25e6a
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1581426
milestone72.0a1
backs oute61b2935e9d500263c9d73a5be6767499c3abb75
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e61b2935e9d5 (bug 1581426) for bc failures at browser_protections_lockwise.js. CLOSED TREE
browser/components/protections/content/lockwise-card.js
browser/components/protections/content/protections.html
browser/locales/en-US/browser/protections.ftl
--- a/browser/components/protections/content/lockwise-card.js
+++ b/browser/components/protections/content/lockwise-card.js
@@ -135,20 +135,25 @@ export default class LockwiseCard {
     // Set the text for the number of synced devices.
     const syncedDevicesBlock = container.querySelector(
       ".number-of-synced-devices.block"
     );
     syncedDevicesBlock.textContent = syncedDevices;
 
     const syncedDevicesText = container.querySelector(".synced-devices-text");
     const textEl = syncedDevicesText.querySelector("span");
-    document.l10n.setAttributes(textEl, "lockwise-connected-device-status", {
-      count: syncedDevices,
-    });
-
+    if (syncedDevices) {
+      textEl.setAttribute(
+        "data-l10n-args",
+        JSON.stringify({ count: syncedDevices })
+      );
+      textEl.setAttribute("data-l10n-id", "lockwise-sync-status");
+    } else {
+      textEl.setAttribute("data-l10n-id", "lockwise-sync-not-syncing-devices");
+    }
     // Display the link for enabling sync if no synced devices are detected.
     if (syncedDevices === 0) {
       const syncLink = this.doc.getElementById("turn-on-sync");
       syncLink.classList.remove("hidden");
     } else {
       const manageDevicesLink = this.doc.getElementById("manage-devices");
       manageDevicesLink.href = MANAGE_DEVICES_URL;
       manageDevicesLink.classList.remove("hidden");
--- a/browser/components/protections/content/protections.html
+++ b/browser/components/protections/content/protections.html
@@ -222,17 +222,17 @@
                 <!-- Display number of synced devices here. -->
               </span>
               <span class="synced-devices-text">
                 <img class="icon-small" src="chrome://browser/skin/sync.svg"/>
                 <span>
                   <!-- Display message for status of synced devices here. -->
                 </span>
                 <a id="turn-on-sync" tabindex="0" class="hidden" href="" data-l10n-id="turn-on-sync"></a>
-                <a id="manage-devices" target="_blank" class="hidden" href="" data-l10n-id="manage-connected-devices"></a>
+                <a id="manage-devices" target="_blank" class="hidden" href="" data-l10n-id="manage-devices"></a>
               </span>
             </div>
           </div>
         </div>
       </section>
       <!-- Markup for Proxy card -->
       <section class="card card-no-hover proxy-card hidden">
         <div class="card-header">
--- a/browser/locales/en-US/browser/protections.ftl
+++ b/browser/locales/en-US/browser/protections.ftl
@@ -74,25 +74,26 @@ lockwise-passwords-stored =
   { $count ->
      [one] Password stored securely <a data-l10n-name="lockwise-how-it-works">How it works</a>
     *[other] Passwords stored securely <a data-l10n-name="lockwise-how-it-works">How it works</a>
   }
 
 turn-on-sync = Turn on { -sync-brand-short-name }…
   .title = Go to sync preferences
 
-manage-connected-devices = Manage devices…
+manage-devices = Manage devices
 
 # Variables:
 #   $count (Number) - Number of devices connected with sync.
-lockwise-connected-device-status =
+lockwise-sync-status =
   { $count ->
-     [one] Connected to { $count } device
-    *[other] Connected to { $count } devices
+     [one] Syncing to { $count } other device
+    *[other] Syncing to { $count } other devices
   }
+lockwise-sync-not-syncing-devices = Not syncing to other devices
 
 monitor-title = Look out for data breaches
 monitor-link = How it works
 monitor-header-content-no-account = Check { -monitor-brand-name } to see if you’ve been part of a known data breach, and get alerts about new breaches.
 monitor-header-content-signed-in = { -monitor-brand-name } warns you if your info has appeared in a known data breach.
 monitor-sign-up = Sign Up for Breach Alerts
 auto-scan = Automatically scanned today