Bug 1629946 - Add region and distribution ID information onto about:support. r=Gijs,fluent-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D71831

toolkit/content/aboutSupport.js

@@ -75,6 +75,7 @@ var snapshotFormatters = {
     }
     $("version-box").textContent = version;
     $("buildid-box").textContent = data.buildID;
+    $("distributionid-box").textContent = data.distributionID;
     if (data.updateChannel) {
       $("updatechannel-box").textContent = data.updateChannel;
     }

toolkit/content/aboutSupport.xhtml

@@ -79,6 +79,11 @@
             <td id="buildid-box"></td>
           </tr>
 
+          <tr>
+            <th class="column" data-l10n-id="app-basics-distribution-id"/>
+            <td id="distributionid-box"></td>
+          </tr>
+
 #ifndef ANDROID
 #ifdef MOZ_UPDATER
           <tr id="update-row" class="no-copy">

toolkit/locales/en-US/toolkit/about/aboutSupport.ftl

@@ -35,6 +35,7 @@ app-basics-title = Application Basics
 app-basics-name = Name
 app-basics-version = Version
 app-basics-build-id = Build ID
+app-basics-distribution-id = Distribution ID
 app-basics-update-channel = Update Channel
 # This message refers to the folder used to store updates on the device,
 # as in "Folder for updates". "Update" is a noun, not a verb.

toolkit/modules/Troubleshoot.jsm

@@ -46,6 +46,7 @@ const PREFS_WHITELIST = [
   "browser.search.log",
   "browser.search.openintab",
   "browser.search.param",
+  "browser.search.region",
   "browser.search.searchEnginesURL",
   "browser.search.suggest.enabled",
   "browser.search.update",
@@ -198,6 +199,9 @@ var dataProviders = {
         Services.sysinfo.getProperty("version"),
       version: AppConstants.MOZ_APP_VERSION_DISPLAY,
       buildID: Services.appinfo.appBuildID,
+      distributionID: Services.prefs
+        .getDefaultBranch("")
+        .getCharPref("distribution.id", ""),
       userAgent: Cc["@mozilla.org/network/protocol;1?name=http"].getService(
         Ci.nsIHttpProtocolHandler
       ).userAgent,