Bug 1472615 - Fix broken Application Details subdialog. r=jorgk a=jorgk BETA_60_CONTINUATION
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 02 Jul 2018 21:09:56 +1200
branchBETA_60_CONTINUATION
changeset 31443 cd1807822aa681ccdbb4fe9f6ad6990dfde2b03d
parent 31442 a5e2122e22321507abd1e22499ad4c2d3e1d64fb
child 31444 722d3ec265eacf7878a8a53556cb8f36db63d207
push id2257
push usermozilla@jorgk.com
push dateMon, 02 Jul 2018 09:51:10 +0000
treeherdercomm-beta@0ac6617abd53 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, jorgk
bugs1472615
Bug 1472615 - Fix broken Application Details subdialog. r=jorgk a=jorgk
mail/components/preferences/applicationManager.js
mail/components/preferences/applicationManager.xul
mail/components/preferences/applications.js
--- a/mail/components/preferences/applicationManager.js
+++ b/mail/components/preferences/applicationManager.js
@@ -4,16 +4,17 @@
 
 var gAppManagerDialog = {
   _removed: [],
 
   init: function appManager_init() {
     this.handlerInfo = window.arguments[0];
 
     var bundle = document.getElementById("appManagerBundle");
+    gApplicationsPane._prefsBundle = document.getElementById("bundlePreferences");
 
     var description = gApplicationsPane._describeType(this.handlerInfo);
     var key = (this.handlerInfo.wrappedHandlerInfo instanceof Ci.nsIMIMEInfo) ?
                 "handleFile" : "handleProtocol";
     var contentText = bundle.getFormattedString(key, [description]);
     contentText = bundle.getFormattedString("descriptionApplications", [contentText]);
     document.getElementById("appDescription").textContent = contentText;
 
--- a/mail/components/preferences/applicationManager.xul
+++ b/mail/components/preferences/applicationManager.xul
@@ -30,16 +30,18 @@
 
   <keyset id="appManagerKeyset">
     <key id="delete" keycode="VK_DELETE" command="cmd_delete"/>
   </keyset>
 
   <stringbundleset id="appManagerBundleset">
     <stringbundle id="appManagerBundle"
                   src="chrome://messenger/locale/preferences/applicationManager.properties"/>
+    <stringbundle id="bundlePreferences"
+                  src="chrome://messenger/locale/preferences/preferences.properties"/>
   </stringbundleset>
 
   <description id="appDescription"/>
   <separator class="thin"/>
   <hbox flex="1">
     <listbox id="appList" onselect="gAppManagerDialog.onSelect();" flex="1"/>
     <vbox>
       <button id="remove"
--- a/mail/components/preferences/applications.js
+++ b/mail/components/preferences/applications.js
@@ -1147,17 +1147,17 @@ var gApplicationsPane = {
       if (exts)
         return this._prefsBundle.getFormattedString("typeDetailsWithTypeAndExt",
                                                     [aHandlerInfo.type,
                                                      exts]);
       return this._prefsBundle.getFormattedString("typeDetailsWithTypeOrExt",
                                                   [ aHandlerInfo.type]);
     }
     if (exts)
-      return this._prefsBundle.getFormattedString("typeDescriptionWithExt",
+      return this._prefsBundle.getFormattedString("typeDetailsWithTypeOrExt",
                                                   [exts]);
     return exts;
   },
   /**
    * Describe, in a human-readable fashion, the preferred action to take on
    * the type represented by the given handler info object.
    *
    * XXX Should this be part of the HandlerInfoWrapper interface?  It would