Bug 1382193 - Fix hardcoded quote in about:telemetry r?flod draft
authorflyingrub <flyinggrub@gmail.com>
Thu, 20 Jul 2017 12:24:25 +0200
changeset 613039 29e402b391b91056f90e17c783165988b626807b
parent 613038 09bf70615c536055566b582241f500cee2c42fff
child 613040 3bfa930ca8b0e6baf2d829fde48cf4319fe1935a
child 613327 9355b30bc091c994d1398f0c275fabdeadf95d49
child 614516 e28658cd1c158fb1a6a5bc48a0a0c799e656883f
child 615856 7a83716ea6939bd4beeb245efe48aa6d8da02d2d
push id69706
push userbmo:flyinggrub@gmail.com
push dateFri, 21 Jul 2017 12:58:38 +0000
reviewersflod
bugs1382193
milestone56.0a1
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