From 5059c221d51e7423037d747352b08032edb3e620 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Fri, 21 Jan 2011 16:37:52 -0800
Subject: [PATCH] Bug 627911 - Fix string errors in extensions.js [r=wesj]

---
 mobile/chrome/content/extensions.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/chrome/content/extensions.js b/mobile/chrome/content/extensions.js
index e164d2563ee..21cf885d82d 100644
--- a/mobile/chrome/content/extensions.js
+++ b/mobile/chrome/content/extensions.js
@@ -288,7 +288,7 @@ var ExtensionsView = {
   },
 
   _createLocalAddon: function ev__createLocalAddon(aAddon) {
-    let strings = Elements.browserBundle;
+    let strings = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
     let appManaged = (aAddon.scope == AddonManager.SCOPE_APPLICATION);
     let opType = this._getOpTypeForOperations(aAddon.pendingOperations);
@@ -936,13 +936,13 @@ AddonInstallListener.prototype = {
 
     // If we are updating an add-on, change the status
     if (element.hasAttribute("updating")) {
-      let strings = Elements.browserBundle;
+      let strings = Services.strings.createBundle("chrome://browser/locale/browser.properties");
       element.setAttribute("updateStatus", strings.getFormattedString("addonUpdate.updated", [aAddon.version]));
       element.removeAttribute("updating");
     }
   },
 
-  onInstallFailed: function(aInstall, aError) {
+  onInstallFailed: function(aInstall) {
     this._showInstallCompleteAlert(false);
 
     if (ExtensionsView.visible) {
@@ -954,7 +954,7 @@ AddonInstallListener.prototype = {
       let strings = Services.strings.createBundle("chrome://global/locale/xpinstall/xpinstall.properties");
 
       let error = null;
-      switch (aError) {
+      switch (aInstall.error) {
       case AddonManager.ERROR_NETWORK_FAILURE:
         error = "error-228";
         break;
@@ -969,7 +969,7 @@ AddonInstallListener.prototype = {
       try {
         var msg = strings.GetStringFromName(error);
       } catch (ex) {
-        msg = strings.formatStringFromName("unknown.error", [aError]);
+        msg = strings.formatStringFromName("unknown.error", [aInstall.error], 1);
       }
       element.setAttribute("error", msg);
     }
@@ -994,8 +994,8 @@ AddonInstallListener.prototype = {
     element.setAttribute("progress", progress);
   },
 
-  onDownloadFailed: function(aInstall, aError) {
-    this.onInstallFailed(aInstall, aError);
+  onDownloadFailed: function(aInstall) {
+    this.onInstallFailed(aInstall);
   },
 
   onDownloadCancelled: function(aInstall) {