Register Firebug string bundle just once + register cookie bundle sooner

firebug · Jun 8, 2012 · e0e71af · e0e71af
1 parent f1419db
commit e0e71af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/extension/content/firebug/cookies/cookieModule.js b/extension/content/firebug/cookies/cookieModule.js
@@ -70,10 +70,6 @@ const panelName = "cookies";
 // Helper array for prematurely created contexts
 var contexts = new Array();
 
-// Extend string bundle with new strings for this extension.
-// This must be done yet before domplate definitions.
-Firebug.registerStringBundle("chrome://firebug/locale/cookies.properties");
-
 // Register stylesheet in Firebug. This method is introduced in Firebug 1.6
 Firebug.registerStylesheet("chrome://firebug/skin/cookies/cookies.css");
 

diff --git a/extension/content/firebug/firebug.js b/extension/content/firebug/firebug.js
@@ -75,18 +75,6 @@ var defaultFuncRep = null;
 var menuItemControllers = [];
 var panelTypeMap = {};
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-try
-{
-    // Register default Firebug string bundle (yet before domplate templates).
-    Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
-}
-catch (exc)
-{
-    dump("Register default string bundle FAILS: "+exc+"\n");
-}
-
 // ********************************************************************************************* //
 
 if (window.Firebug)

diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
@@ -27,9 +27,16 @@ var firebugURLs =
     firstRunPage: "http://getfirebug.com/firstrun#Firebug "
 };
 
+// ********************************************************************************************* //
+// String Bundles
+
 // Register bundle yet before any Locale.$STR* API is used.
 Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
 
+// xxxHonza: this needs to be done befor firebug/cookies modules are loaded
+// and it should be part of the cookies directory.
+Locale.registerStringBundle("chrome://firebug/locale/cookies.properties");
+
 // ********************************************************************************************* //
 // Overlay Helpers