From bcd3bcd8e5dddfd2ed54b1bb48b169948143fcb6 Mon Sep 17 00:00:00 2001
From: "disttsc%bart.nl" <disttsc%bart.nl>
Date: Thu, 14 Sep 2006 05:55:56 +0000
Subject: [PATCH] Move over, strres.js, the new, sexy <stringbundle/> is in
 Browser Town. bug=56680, r=timeless, a=ben

---
 suite/browser/navigator.js        | 23 +++++++++++++----------
 suite/browser/navigator.xul       |  5 ++++-
 suite/browser/navigatorDD.js      |  8 ++++----
 suite/browser/sessionHistoryUI.js |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 697e30067c56..493758057969 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -25,8 +25,8 @@
 const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
 
 var gURLBar = null;
-var bundle = srGetStrBundle("chrome://navigator/locale/navigator.properties");
-var brandBundle = srGetStrBundle("chrome://global/locale/brand.properties");
+var gNavigatorBundle;
+var gBrandBundle;
 
 var pref = Components.classes["@mozilla.org/preferences;1"]
                      .getService(Components.interfaces.nsIPref);
@@ -128,7 +128,7 @@ function UpdateInternetSearchResults(event)
 
 function nsXULBrowserWindow()
 {
-  this.defaultStatus = bundle.GetStringFromName("defaultStatus");
+  this.defaultStatus = gNavigatorBundle.getString("defaultStatus");
 }
 
 nsXULBrowserWindow.prototype =
@@ -265,7 +265,7 @@ nsXULBrowserWindow.prototype =
         if (location != "about:blank") {
           // Record page loading time.
           var elapsed = ((new Date()).getTime() - this.startTime) / 1000;
-          msg = bundle.GetStringFromName("nv_done");
+          msg = gNavigatorBundle.getString("nv_done");
           msg = msg.replace(/%elapsed%/, elapsed);
         }
         this.setDefaultStatus(msg);
@@ -353,7 +353,7 @@ function getHomePage()
 
   // use this if we can't find the pref
   if (!url)
-    url = bundle.GetStringFromName("homePageDefault");
+    url = gNavigatorBundle.getString("homePageDefault");
 
   return url;
 }
@@ -402,6 +402,9 @@ nsButtonPrefListener.prototype =
 
 function Startup()
 {
+  gNavigatorBundle = document.getElementById("bundle_navigator");
+  gBrandBundle = document.getElementById("bundle_brand");
+
   window.XULBrowserWindow = new nsXULBrowserWindow();
   window.buttonPrefListener = new nsButtonPrefListener();
 
@@ -644,7 +647,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
 {
   var autoOpenSearchPanel = false;
   var defaultSearchURL = null;
-  var fallbackDefaultSearchURL = bundle.GetStringFromName("fallbackDefaultSearchURL");
+  var fallbackDefaultSearchURL = gNavigatorBundle.getString("fallbackDefaultSearchURL");
   // XXX This somehow causes a big leak, back to the old way
   //     till we figure out why. See bug 61886.
   // var url = getWebNavigation().currentURI.spec;
@@ -664,7 +667,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
     if (defaultSearchURL != fallbackDefaultSearchURL)
       loadURI(defaultSearchURL);
     else
-      loadURI(bundle.GetStringFromName("otherSearchURL"));
+      loadURI(gNavigatorBundle.getString("otherSearchURL"));
 
   } else {
     var searchMode = 0;
@@ -762,7 +765,7 @@ function BrowserOpenFileWindow()
   try {
     const nsIFilePicker = Components.interfaces.nsIFilePicker;
     var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-    fp.init(window, bundle.GetStringFromName("openFile"), nsIFilePicker.modeOpen);
+    fp.init(window, gNavigatorBundle.getString("openFile"), nsIFilePicker.modeOpen);
     fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText | nsIFilePicker.filterImages |
                      nsIFilePicker.filterXML | nsIFilePicker.filterHTML);
 
@@ -1045,7 +1048,7 @@ var consoleListener = {
       var statusbarDisplay = document.getElementById("statusbar-display");
       statusbarDisplay.setAttribute("error", "true");
       statusbarDisplay.addEventListener("click", loadErrorConsole, true);
-      statusbarDisplay.value = bundle.GetStringFromName("jserror");
+      statusbarDisplay.value = gNavigatorBundle.getString("jserror");
       this.isShowingError = true;
     }
   },
@@ -1257,7 +1260,7 @@ function applyTheme(themeName)
 
 function getNewThemes()
 {
-  loadURI(brandBundle.GetStringFromName("getNewThemesURL"));
+  loadURI(gBrandBundle.getString("getNewThemesURL"));
 }
 
 function URLBarLeftClickHandler(aEvent)
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 9972930863b5..57a271e46685 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -72,7 +72,10 @@ Contributor(s): ______________________________________. -->
 <script type="text/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
 
 <!-- hook for stringbundle overlays -->
-<stringbundleset id="stringbundleset"/>
+<stringbundleset id="stringbundleset">
+  <stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
+  <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+</stringbundleset>
 
 <commands id="commands">
 	<commandset id="globalEditMenuItems"/>
diff --git a/suite/browser/navigatorDD.js b/suite/browser/navigatorDD.js
index a175969795dc..abc3202003c1 100644
--- a/suite/browser/navigatorDD.js
+++ b/suite/browser/navigatorDD.js
@@ -303,9 +303,9 @@ var homeButtonObserver = {
       var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
                                 "nsICommonDialogs");
       var pressedVal = { };                            
-      var promptTitle = bundle.GetStringFromName("droponhometitle");
-      var promptMsg   = bundle.GetStringFromName("droponhomemsg");
-      var okButton    = bundle.GetStringFromName("droponhomeokbutton");
+      var promptTitle = gNavigatorBundle.getString("droponhometitle");
+      var promptMsg   = gNavigatorBundle.getString("droponhomemsg");
+      var okButton    = gNavigatorBundle.getString("droponhomeokbutton");
       var iconURL     = "chrome://navigator/skin/home.gif"; // evil evil common dialog code! evil! 
 
       commonDialogService.UniversalDialog(window, null, promptTitle, promptMsg, null, 
@@ -321,7 +321,7 @@ var homeButtonObserver = {
   onDragOver: function (aEvent, aFlavour, aDragSession)
     {
       var statusTextFld = document.getElementById("statusbar-display");
-      statusTextFld.setAttribute("value", bundle.GetStringFromName("droponhomebutton"));
+      statusTextFld.setAttribute("value", gNavigatorBundle.getString("droponhomebutton"));
     },
     
   onDragExit: function (aEvent, aDragSession)
diff --git a/suite/browser/sessionHistoryUI.js b/suite/browser/sessionHistoryUI.js
index b1bd4815abe8..ad0043fe15aa 100644
--- a/suite/browser/sessionHistoryUI.js
+++ b/suite/browser/sessionHistoryUI.js
@@ -98,7 +98,7 @@ function createUBHistoryMenu( aParent )
       deleteHistoryItems(aParent);
       if (!entries.hasMoreElements()) {
         //Create the "Nothing Available" Menu item
-        var na = bundle.GetStringFromName( "nothingAvailable" );
+        var na = gNavigatorBundle.getString("nothingAvailable");
         createMenuItem(aParent, "nothing_available", na);
       }