Bug 1632449 - Port bug 1629946: Add region and distribution ID information onto about:support. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Thu, 23 Apr 2020 21:29:01 +0300
changeset 38030 e5f1a16870bf433173f464239e9068f7075ed9c1
parent 38029 53c02cf46815108a2fdcb6e8872ff09c5a63054c
child 38031 fa75d289eeb4fea42b63c6872a0c4391f0c73f70
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1632449, 1629946
Bug 1632449 - Port bug 1629946: Add region and distribution ID information onto about:support. r=mkmelin Port of https://hg.mozilla.org/mozilla-central/rev/87b4d7ad037b
mail/components/about-support/content/aboutSupport.js
mail/components/about-support/content/aboutSupport.xhtml
--- a/mail/components/about-support/content/aboutSupport.js
+++ b/mail/components/about-support/content/aboutSupport.js
@@ -98,16 +98,17 @@ var snapshotFormatters = {
     ).path;
     $("supportLink").href = data.supportURL;
     let version = AppConstants.MOZ_APP_VERSION_DISPLAY;
     if (data.vendor) {
       version += " (" + data.vendor + ")";
     }
     $("version-box").textContent = version;
     $("buildid-box").textContent = data.buildID;
+    $("distributionid-box").textContent = data.distributionID;
     if (data.updateChannel) {
       $("updatechannel-box").textContent = data.updateChannel;
     }
     if (AppConstants.MOZ_UPDATER) {
       $("update-dir-box").textContent = Services.dirsvc.get(
         "UpdRootD",
         Ci.nsIFile
       ).path;
--- a/mail/components/about-support/content/aboutSupport.xhtml
+++ b/mail/components/about-support/content/aboutSupport.xhtml
@@ -98,16 +98,21 @@
             </td>
           </tr>
 
           <tr>
             <th class="column" data-l10n-id="app-basics-build-id"/>
             <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">
             <th class="column" data-l10n-id="app-basics-update-dir"/>
 
             <td>
               <button id="update-dir-button" data-l10n-id="show-dir-label"/>
                <span id="update-dir-box" dir="ltr">