Bug 1382193 - Fix hardcoded quote in about:telemetry r=flod
authorflyingrub <flyinggrub@gmail.com>
Thu, 20 Jul 2017 12:24:25 +0200
changeset 419796 753f56ca9c9f234cc58ad1dd096e8ee4b8b95894
parent 419795 d6d2bce75387d8ba16c8cf9794ca51460b6e0df2
child 419797 8b274bfe790511b3517f9dc98f54f56efc8dee7c
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1382193
milestone56.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 1382193 - Fix hardcoded quote in about:telemetry r=flod Remove the quote form the js file and add it to the string file. MozReview-Commit-ID: JGgywPJ755J
toolkit/content/aboutTelemetry.js
toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -341,17 +341,17 @@ var PingPicker = {
   },
 
   onPingDisplayChanged() {
     this.update();
   },
 
   render() {
     let pings = bundle.GetStringFromName("pingExplanationLink");
-    let pingLink = "<a href=\"http://gecko.readthedocs.io/en/latest/toolkit/components/telemetry/telemetry/concepts/pings.html\">&quot;" + pings + "&quot;</a>";
+    let pingLink = "<a href=\"http://gecko.readthedocs.io/en/latest/toolkit/components/telemetry/telemetry/concepts/pings.html\">" + pings + "</a>";
     let pingName = this._getSelectedPingName();
 
     let pingDate = document.getElementById("ping-date");
     pingDate.textContent = pingName;
     pingDate.setAttribute("title", pingName);
 
     // Display the type and controls if the ping is not current
     let pingType = document.getElementById("ping-type");
@@ -368,17 +368,17 @@ var PingPicker = {
       newer.hidden = true;
     }
 
     if (pingName !== "current") {
       pingName += ", " + this._getSelectedPingType();
     }
     let pingNameHtml = "<span class=\"change-ping\">" + pingName + "</span>";
 
-    let explanation = bundle.formatStringFromName("pingExplanation", [pingLink, pingNameHtml], 2);
+    let explanation = bundle.formatStringFromName("pingDetails", [pingLink, pingNameHtml], 2);
     let pingExplanation = document.getElementById("ping-explanation");
 
     // eslint-disable-next-line no-unsanitized/property
     pingExplanation.innerHTML = explanation;
     pingExplanation.querySelector(".change-ping").addEventListener("click", () =>
       document.getElementById("ping-picker").classList.remove("hidden")
     );
 
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -10,17 +10,17 @@ pageSubtitle = This page shows the infor
 # Note to translators:
 # - %1$S will be replaced by either telemetryEnabled or telemetryDisabled
 # - %2$S will be replaced by either extendedTelemetryEnabled or extendedTelemetryDisabled
 homeExplanation = Telemetry is %1$S and extended telemetry is %2$S.
 
 # Note to translators:
 # - %1$S will be replaced by a link with pingExplanationLink
 # - %2$S will be replaced by the ping name
-pingExplanation = Each piece of information is sent bundled into %1$S. You are looking at the %2$S ping.
+pingDetails = Each piece of information is sent bundled into ā€œ%1$Sā€œ. You are looking at the %2$S ping.
 
 pingExplanationLink = pings
 
 telemetryEnabled = enabled
 
 telemetryDisabled = disabled
 
 extendedTelemetryEnabled = enabled