Bug 1382193 - Fix Strings issue in about:telemetry r?flod
Add its own strings to the value of extendedTelemetryEnabled so that it
is independent of of telemetryEnabled.
MozReview-Commit-ID: 8p35LuWbiDw
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -265,18 +265,20 @@ var Settings = {
return status;
},
/**
* Updates the button & text at the top of the page to reflect Telemetry state.
*/
render() {
let homeExplanation = document.getElementById("home-explanation");
- let fhrEnabled = this.getStatusStringForSetting(this.SETTINGS[0]);
- let extendedEnabled = this.getStatusStringForSetting(this.SETTINGS[1]);
+ let fhrEnabled = Preferences.get(this.SETTINGS[0].pref, this.SETTINGS[0].defaultPrefValue);
+ fhrEnabled = bundle.GetStringFromName(fhrEnabled ? "telemetryEnabled" : "telemetryDisabled");
+ let extendedEnabled = Preferences.get(this.SETTINGS[1].pref, this.SETTINGS[1].defaultPrefValue);
+ extendedEnabled = bundle.GetStringFromName(extendedEnabled ? "extendedTelemetryEnabled" : "extendedTelemetryDisabled");
let parameters = [fhrEnabled, extendedEnabled].map(this.convertStringToLink);
let explanation = bundle.formatStringFromName("homeExplanation", parameters, 2);
// eslint-disable-next-line no-unsanitized/property
homeExplanation.innerHTML = explanation;
this.attachObservers()
},
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -4,30 +4,34 @@
# Note to translators:
# - %1$S will be replaced by brandFullName
# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
pageSubtitle = This page shows the information about performance, hardware, usage and customizations collected by Telemetry. This information is submitted to %1$S to help improve %2$S.
# Note to translators:
# - %1$S will be replaced by either telemetryEnabled or telemetryDisabled
-# - %2$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.
pingExplanationLink = pings
telemetryEnabled = enabled
telemetryDisabled = disabled
+extendedTelemetryEnabled = enabled
+
+extendedTelemetryDisabled = disabled
+
telemetryPingTypeAll = all
telemetryLogTitle = Telemetry Log
telemetryLogHeadingId = Id
telemetryLogHeadingTimestamp = Timestamp