Bug 1577465 - Protection report string revisions. r=fluent-reviewers,johannh,flod
☠☠ backed out by 064ba327807b ☠ ☠
authorErica Wright <ewright@mozilla.com>
Thu, 29 Aug 2019 18:57:09 +0000
changeset 554451 8d947d23ed42739681c06e81276b75e287eddaac
parent 554450 5395a79f7a0b00cc89d3a4d567d542789808900e
child 554452 851753e78f79f73adeb7e488ffcc3ef76098e6b1
push id2165
push userffxbld-merge
push dateMon, 14 Oct 2019 16:30:58 +0000
treeherdermozilla-release@0eae18af659f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfluent-reviewers, johannh, flod
bugs1577465
milestone70.0a1
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
Bug 1577465 - Protection report string revisions. r=fluent-reviewers,johannh,flod Differential Revision: https://phabricator.services.mozilla.com/D44024
browser/components/protections/content/lockwise-card.js
browser/components/protections/content/monitor-card.js
browser/components/protections/content/protections.html
browser/components/protections/content/protections.js
browser/locales/en-US/browser/protections.ftl
--- a/browser/components/protections/content/lockwise-card.js
+++ b/browser/components/protections/content/lockwise-card.js
@@ -142,17 +142,17 @@ export default class LockwiseCard {
     const textEl = syncedDevicesText.querySelector("span");
     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");
+      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;
--- a/browser/components/protections/content/monitor-card.js
+++ b/browser/components/protections/content/monitor-card.js
@@ -70,27 +70,30 @@ export default class MonitorClass {
     const headerContent = this.doc.querySelector(
       "#monitor-header-content span"
     );
     const monitorCard = this.doc.querySelector(".card.monitor-card");
     if (numLogins > 0 && !monitorData.error) {
       monitorCard.classList.add("has-logins");
       headerContent.setAttribute(
         "data-l10n-id",
-        "monitor-header-content-logged-in"
+        "monitor-header-content-signed-in"
       );
       this.renderContentForUserWithLogins(monitorData);
     } else {
       monitorCard.classList.add("no-logins");
       const signUpForMonitorLink = this.doc.getElementById(
         "sign-up-for-monitor-link"
       );
       signUpForMonitorLink.href = this.buildMonitorUrl(monitorData.userEmail);
       signUpForMonitorLink.setAttribute("data-l10n-id", "monitor-sign-up");
-      headerContent.setAttribute("data-l10n-id", "monitor-header-content");
+      headerContent.setAttribute(
+        "data-l10n-id",
+        "monitor-header-content-no-account"
+      );
       signUpForMonitorLink.addEventListener("click", () => {
         this.doc.sendTelemetryEvent("click", "mtr_signup_button");
       });
     }
   }
 
   /**
    * Builds the appropriate URL that takes the user to the Monitor website's
@@ -133,34 +136,34 @@ export default class MonitorClass {
       "info-monitored-addresses"
     );
     infoMonitoredAddresses.setAttribute(
       "data-l10n-args",
       JSON.stringify({ count: monitorData.monitoredEmails })
     );
     infoMonitoredAddresses.setAttribute(
       "data-l10n-id",
-      "info-monitored-addresses"
+      "info-monitored-emails"
     );
 
     const infoKnownBreaches = this.doc.getElementById("info-known-breaches");
     infoKnownBreaches.setAttribute(
       "data-l10n-args",
       JSON.stringify({ count: monitorData.numBreaches })
     );
-    infoKnownBreaches.setAttribute("data-l10n-id", "info-known-breaches");
+    infoKnownBreaches.setAttribute("data-l10n-id", "info-known-breaches-found");
 
     const infoExposedPasswords = this.doc.getElementById(
       "info-exposed-passwords"
     );
     infoExposedPasswords.setAttribute(
       "data-l10n-args",
       JSON.stringify({ count: monitorData.passwords })
     );
-    infoExposedPasswords.setAttribute("data-l10n-id", "info-exposed-passwords");
+    infoExposedPasswords.setAttribute("data-l10n-id", "info-exposed-passwords-found");
 
     // Display Lockwise section if there are any potential breached logins to report.
     if (monitorData.potentiallyBreachedLogins > 0) {
       const lockwiseSection = this.doc.querySelector(
         ".monitor-breached-passwords"
       );
       const exposedLockwisePasswords = this.doc.querySelector(
         "span[data-type='breached-lockwise-passwords']"
--- a/browser/components/protections/content/protections.html
+++ b/browser/components/protections/content/protections.html
@@ -80,17 +80,17 @@
                 <div id="cookie" class="tab-content">
                   <p id="cookieTitle" class="content-title" data-l10n-id="cookie-tab-title"></p>
                   <p id="cookieContent" data-l10n-id="cookie-tab-content">
                     <a target="_blank" id="cookie-link" data-l10n-name="learn-more-link"></a>
                   </p>
                 </div>
                 <div id="tracker" class="tab-content">
                   <p id="trackerTitle" class="content-title" data-l10n-id="tracker-tab-title"></p>
-                  <p id="trackerContent" data-l10n-id="tracker-tab-content">
+                  <p id="trackerContent" data-l10n-id="tracker-tab-description">
                     <a target="_blank" id="tracker-link" data-l10n-name="learn-more-link"></a>
                   </p>
                 </div>
                 <div id="fingerprinter" class="tab-content">
                   <p id="fingerprinterTitle" class="content-title" data-l10n-id="fingerprinter-tab-title"></p>
                   <p id="fingerprinterContent" data-l10n-id="fingerprinter-tab-content">
                     <a target="_blank" id="fingerprinter-link" data-l10n-name="learn-more-link"></a>
                   </p>
--- a/browser/components/protections/content/protections.js
+++ b/browser/components/protections/content/protections.js
@@ -76,17 +76,17 @@ document.addEventListener("DOMContentLoa
       ? new Date(data.earliestDate).getTime() + hoursInMS12
       : Date.now();
 
     let summary = document.getElementById("graph-total-summary");
     summary.setAttribute(
       "data-l10n-args",
       JSON.stringify({ count: data.sumEvents, earliestDate: dateInMS })
     );
-    summary.setAttribute("data-l10n-id", "graph-total-summary");
+    summary.setAttribute("data-l10n-id", "graph-total-tracker-summary");
 
     // Set a default top size for the height of the graph bars so that small
     // numbers don't fill the whole graph.
     let largest = 100;
     if (largest < data.largest) {
       largest = data.largest;
     }
     let weekCount = 0;
--- a/browser/locales/en-US/browser/protections.ftl
+++ b/browser/locales/en-US/browser/protections.ftl
@@ -1,28 +1,28 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Variables:
 #   $count (Number) - Number of tracking events blocked.
 graph-week-summary =
   { $count ->
-     [one] { -brand-short-name } blocked  { $count } tracker over the past week
+     [one] { -brand-short-name } blocked { $count } tracker over the past week
     *[other] { -brand-short-name } blocked { $count } trackers over the past week
   }
 
 # Variables:
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
 # earliest date recorded in the database.
-graph-total-summary =
+graph-total-tracker-summary =
   { $count ->
-     [one] { $count } tracker blocked since { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
-    *[other] { $count } trackers blocked since { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+     [one] <b>{ $count }</b> tracker blocked since { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+    *[other] <b>{ $count }</b> trackers blocked since { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
   }
 
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
 # "Standard" in this case is an adjective, meaning "default" or "normal".
 # The category name in the <b> tag will be bold.
 protection-header-details-standard = Protection Level is set to <b>Standard</b>
 protection-header-details-strict = Protection Level is set to <b>Strict</b>
 protection-header-details-custom = Protection Level is set to <b>Custom</b>
@@ -41,17 +41,17 @@ graph-legend-description = A graph conta
 
 social-tab-title = Social Media Trackers
 social-tab-contant = Social networks place trackers on other websites to follow what you do, see, and watch online. This allows social media companies to learn more about you beyond what you share on your social media profiles. <a data-l10n-name="learn-more-link">Learn more</a>
 
 cookie-tab-title = Cross-Site Tracking Cookies
 cookie-tab-content = These cookies follow you from site to site to gather data about what you do online. They are set by third parties such as advertisers and analytics companies. Blocking cross-site tracking cookies reduces the number of ads that follow you around. <a data-l10n-name="learn-more-link">Learn more</a>
 
 tracker-tab-title = Tracking Content
-tracker-tab-content = Websites may load external ads, videos, and other content that contain tracking code. Blocking tracking content can help sites load faster, but some buttons, forms, and login fields might not work. <a data-l10n-name="learn-more-link">Learn more</a>
+tracker-tab-description = Websites may load external ads, videos, and other content that contain tracking code. Blocking tracking content can help sites load faster, but some buttons, forms, and login fields might not work <a data-l10n-name="learn-more-link">Learn more</a>
 
 fingerprinter-tab-title = Fingerprinters
 fingerprinter-tab-content = Fingerprinters collect settings from your browser and computer to create a profile of you. Using this digital fingerprint, they can track you across different websites. <a data-l10n-name="learn-more-link">Learn more</a>
 
 cryptominer-tab-title = Cryptominers
 cryptominer-tab-content = Cryptominers use your system’s computing power to mine digital money. Cryptomining scripts drain your battery, slow down your computer, and can increase your energy bill. <a data-l10n-name="learn-more-link">Learn more</a>
 
 lockwise-title = Never forget a password again
@@ -77,50 +77,50 @@ manage-devices = Manage devices
 
 # Variables:
 #   $count (Number) - Number of devices connected with sync.
 lockwise-sync-status =
   { $count ->
      [one] Syncing to { $count } other device
     *[other] Syncing to { $count } other devices
   }
-lockwise-sync-not-syncing = Not syncing to 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 = Check { -monitor-brand-name } to see if you’ve been part of a data breach and get alerts about new breaches.
-monitor-header-content-logged-in = { -monitor-brand-name } warns you if your info has appeared in a known data breach
+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
 
 # This string is displayed after a large numeral that indicates the total number
 # of email addresses being monitored. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-monitored-addresses =
+info-monitored-emails =
   { $count ->
-     [one] Email address being monitored.
-    *[other] Email addresses being monitored.
+     [one] Email address being monitored
+    *[other] Email addresses being monitored
   }
 
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-known-breaches =
+info-known-breaches-found =
   { $count ->
-     [one] Known data breach has exposed your information.
-    *[other] Known data breaches have exposed your information.
+     [one] Known data breach has exposed your information
+    *[other] Known data breaches have exposed your information
   }
 
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-exposed-passwords =
+info-exposed-passwords-found =
   { $count ->
-     [one] Password exposed across all breaches.
-    *[other] Passwords exposed across all breaches.
+     [one] Password exposed across all breaches
+    *[other] Passwords exposed across all breaches
   }
 
 full-report-link = View full report on <a data-l10n-name="monitor-inline-link">{ -monitor-brand-name }</a>
 
 # This string is displayed after a large numeral that indicates the total number
 # of saved logins which may have been exposed. Don’t add $count to
 # your localization, because it would result in the number showing twice.
 password-warning =