Bug 1507614 - Identify ESR with MOZ_APP_VERSION_DISPLAY. r=glandium
authorMichael Kaply <mozilla@kaply.com>
Mon, 19 Nov 2018 23:14:05 +0000
changeset 447079 9e05a9bac1e53d9994946c32f8121523b8d9b5c1
parent 447078 8384aff8cc59b921445914e936dab3bb33701f8d
child 447080 8d1906db146ea3ba00bc96965ac4978edd410f19
push id73317
push usermozilla@kaply.com
push dateMon, 19 Nov 2018 23:15:23 +0000
treeherderautoland@9e05a9bac1e5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1507614
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1507614 - Identify ESR with MOZ_APP_VERSION_DISPLAY. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D12067
browser/base/content/aboutDialog.js
browser/base/content/aboutDialog.xul
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -32,16 +32,17 @@ async function init(aEvent) {
       var distroField = document.getElementById("distribution");
       distroField.value = distroAbout;
       distroField.style.display = "block";
     }
   }
 
   // Include the build ID and display warning if this is an "a#" (nightly or aurora) build
   let versionField = document.getElementById("version");
+  versionField.textContent = AppConstants.MOZ_APP_VERSION_DISPLAY;
   let version = Services.appinfo.version;
   if (/a\d+$/.test(version)) {
     let buildID = Services.appinfo.appBuildID;
     let year = buildID.slice(0, 4);
     let month = buildID.slice(4, 6);
     let day = buildID.slice(6, 8);
     versionField.textContent += ` (${year}-${month}-${day})`;
 
@@ -72,17 +73,17 @@ async function init(aEvent) {
 
     let channelLabel = document.getElementById("currentChannel");
     let currentChannelText = document.getElementById("currentChannelText");
     channelLabel.value = UpdateUtils.UpdateChannel;
     if (/^release($|\-)/.test(channelLabel.value))
         currentChannelText.hidden = true;
   }
 
-  if (AppConstants.MOZ_UPDATE_CHANNEL == "esr") {
+  if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) {
     document.getElementById("release").hidden = false;
   }
   if (AppConstants.platform == "macosx") {
     // it may not be sized at this point, and we need its width to calculate its position
     window.sizeToContent();
     window.moveTo((screen.availWidth / 2) - (window.outerWidth / 2), screen.availHeight / 5);
   }
 }
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -48,17 +48,17 @@
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
         <label id="release" hidden="true">
         <!-- This string is explicitly not translated -->
           Extended Support Release
         </label>
         <hbox align="baseline">
-#expand   <label id="version">__MOZ_APP_VERSION_DISPLAY__</label>
+          <label id="version"/>
           <label id="releasenotes" class="text-link" hidden="true" data-l10n-id="releaseNotes-link"></label>
         </hbox>
 
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
         <vbox id="detailsBox">
           <vbox id="updateBox">