Bug 1105196 - Make updates work from the Metro front end, add handling for 1 instance handling updates. Port of bug 794937. r=mkmelin
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 16 Feb 2015 15:14:44 +0100
changeset 17492 fc1a7f839e84b9b7705b3393a13dc755f2734da6
parent 17491 ee282260afa6c178e7a0b8d2981880acf64342b5
child 17493 5f106c8123769e77054220d688ef7a39c5e7e4a4
push id10768
push userarchaeopteryx@coole-files.de
push dateMon, 16 Feb 2015 14:15:59 +0000
treeherdercomm-central@edbe6308109f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1105196, 794937
Bug 1105196 - Make updates work from the Metro front end, add handling for 1 instance handling updates. Port of bug 794937. r=mkmelin
mail/base/content/aboutDialog.js
mail/base/content/aboutDialog.xul
mail/locales/en-US/chrome/messenger/aboutDialog.dtd
--- a/mail/base/content/aboutDialog.js
+++ b/mail/base/content/aboutDialog.js
@@ -142,16 +142,21 @@ function appUpdater()
     return;
   }
 
   if (this.isPending || this.isApplied) {
     this.selectPanel("apply");
     return;
   }
 
+  if (this.aus.isOtherInstanceHandlingUpdates) {
+    this.selectPanel("otherInstanceHandlingUpdates");
+    return;
+  }
+
   if (this.isDownloading) {
     this.startDownload();
     // selectPanel("downloading") is called from setupDownloadingUI().
     return;
   }
 
   // Honor the "Never check for updates" option by not only disabling background
   // update checks, but also in the About dialog, by presenting a
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -89,16 +89,19 @@
                 <label>&update.failed.start;</label><label id="failedLink" class="text-link">&update.failed.linkText;</label><label>&update.failed.end;</label>
               </hbox>
               <hbox id="adminDisabled" align="center">
                 <label>&update.adminDisabled;</label>
               </hbox>
               <hbox id="noUpdatesFound" align="center">
                 <label>&update.noUpdatesFound;</label>
               </hbox>
+              <hbox id="otherInstanceHandlingUpdates" align="center">
+                <label>&update.otherInstanceHandlingUpdates;</label>
+              </hbox>
               <hbox id="manualUpdate" align="center">
                 <label>&update.manual.start;</label><label id="manualLink" class="text-link">&update.manual.linkText;</label><label>&update.manual.end;</label>
               </hbox>
               <hbox id="unsupportedSystem" align="center">
                 <label>&update.unsupported.start;</label><label id="unsupportedLink" class="text-link">&update.unsupported.linkText;</label><label>&update.unsupported.end;</label>
               </hbox>
             </deck>
 #endif
--- a/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
+++ b/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
@@ -51,16 +51,18 @@
 <!ENTITY bottomLinks.privacy        "Privacy Policy">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Checking for updates…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; is being updated by another instance">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.failed.start        "Update failed. ">
 <!ENTITY update.failed.linkText     "Download the latest version">