Bug 1443771 - Add ESR name to the about dialog. It is not translated. r=Felipe,jaws
authorMichael Kaply <mozilla@kaply.com>
Wed, 14 Mar 2018 17:41:26 -0500
changeset 409046 0fd93dddaf2c
parent 409045 1fce5707743a
child 409047 25ddde05fe9a
push id61403
push usermozilla@kaply.com
push dateTue, 20 Mar 2018 18:30:43 +0000
treeherderautoland@0fd93dddaf2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFelipe, jaws
bugs1443771
milestone61.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 1443771 - Add ESR name to the about dialog. It is not translated. r=Felipe,jaws MozReview-Commit-ID: FYjA7IrTGYt
browser/base/content/aboutDialog.css
browser/base/content/aboutDialog.js
browser/base/content/aboutDialog.xul
--- a/browser/base/content/aboutDialog.css
+++ b/browser/base/content/aboutDialog.css
@@ -21,16 +21,23 @@
 #rightBox:-moz-locale-dir(rtl) {
   background-position: 100% 0;
 }
 
 #bottomBox {
   padding: 15px 10px 0;
 }
 
+#release {
+  font-weight: bold;
+  font-size: 125%;
+  margin-top: 10px;
+  margin-inline-start: 0;
+}
+
 #version {
   font-weight: bold;
   margin-top: 10px;
   margin-left: 0;
   -moz-user-select: text;
   -moz-user-focus: normal;
   cursor: text;
 }
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -73,14 +73,17 @@ 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") {
+    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
@@ -40,16 +40,20 @@
   <script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
 #ifdef MOZ_UPDATER
   <script type="application/javascript" src="chrome://browser/content/aboutDialog-appUpdater.js"/>
 #endif
   <vbox id="aboutDialogContainer">
     <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="releasenotes" class="text-link" hidden="true">&releaseNotes.link;</label>
         </hbox>
 
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>