merge mozilla-central to autoland. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 24 Oct 2017 12:57:31 +0200
changeset 685725 c41827492ec5321f2e10b5093010d108b3eeac37
parent 685724 f5121cba7d7b5031d69bcc7179c227c1858265a5 (current diff)
parent 685374 cfb0f6d21b357de71e82466bff6f6c43d0b77425 (diff)
child 685726 baca0818395316e15c4c59a8382bccb14d9168e7
push id86016
push userkgupta@mozilla.com
push dateWed, 25 Oct 2017 01:53:44 +0000
reviewersmerge, merge
milestone58.0a1
merge mozilla-central to autoland. r=merge a=merge
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -215,29 +215,27 @@ var Settings = {
     let status = bundle.GetStringFromName(enabled ? "telemetryEnabled" : "telemetryDisabled");
     return status;
   },
 
   /**
    * Updates the button & text at the top of the page to reflect Telemetry state.
    */
   render() {
-    let settingsExplanation = document.getElementById("settings-explanation");
-    let uploadEnabled = this.getStatusStringForSetting(this.SETTINGS[0]);
-    let extendedEnabled = Services.telemetry.canRecordExtended;
-    let collectedData = bundle.GetStringFromName(extendedEnabled ? "prereleaseData" : "releaseData");
+    let homeExplanation = document.getElementById("home-explanation");
+    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 parameters = [
-      collectedData,
-      this.convertStringToLink(uploadEnabled),
-    ];
-    let explanation = bundle.formatStringFromName("settingsExplanation", parameters, 2);
+    let explanation = bundle.formatStringFromName("homeExplanation", parameters, 2);
 
     // eslint-disable-next-line no-unsanitized/property
-    settingsExplanation.innerHTML = explanation;
+    homeExplanation.innerHTML = explanation;
     this.attachObservers();
   },
 
   convertStringToLink(string) {
     return "<a href=\"\" class=\"change-data-choices-link\">" + string + "</a>";
   },
 };
 
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -140,17 +140,17 @@
 
       <div id="no-search-results" hidden="true" class="hidden">
         <span id="no-search-results-text"></span>
         <div class="no-search-results-image"></div>
       </div>
 
       <section id="home-section" class="active">
         <p id="page-subtitle"></p>
-        <p id="settings-explanation"></p>
+        <p id="home-explanation"></p>
         <p id="ping-explanation"></p>
         <p>&aboutTelemetry.moreInformations;</p>
         <ul>
           <li>&aboutTelemetry.firefoxDataDoc;</li>
           <li>&aboutTelemetry.telemetryClientDoc;</li>
           <li>&aboutTelemetry.telemetryDashboard;</li>
         </ul>
       </section>
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -2,24 +2,24 @@
 # 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/.
 
 # LOCALIZATION NOTE(pageSubtitle):
 # - %1$S is replaced by the value of the toolkit.telemetry.server_owner preference
 # - %2$S is replaced by brandFullName
 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.
 
-# LOCALIZATION NOTE(settingsExplanation):
-# - %1$S is either releaseData or prereleaseData
-# - %2$S is either telemetryEnabled or telemetryDisabled
-settingsExplanation = Telemetry is collecting %1$S and upload is %2$S.
-releaseData = release data
-prereleaseData = pre-release data
+# LOCALIZATION NOTE(homeExplanation):
+# - %1$S is either telemetryEnabled or telemetryDisabled
+# - %2$S is either extendedTelemetryEnabled or extendedTelemetryDisabled
+homeExplanation = Telemetry is %1$S and extended telemetry is %2$S.
 telemetryEnabled = enabled
 telemetryDisabled = disabled
+extendedTelemetryEnabled = enabled
+extendedTelemetryDisabled = disabled
 
 # LOCALIZATION NOTE(pingDetails):
 # - %1$S is replaced by a link with pingExplanationLink as text
 # - %2$S is replaced by namedPing
 pingDetails = Each piece of information is sent bundled into “%1$S”. You are looking at the %2$S ping.
 # LOCALIZATION NOTE(namedPing):
 # - %1$S is replaced by the ping localized timestamp, e.g. “2017/07/08 10:40:46”
 # - %2$S is replaced by the ping name, e.g. “saved-session”