Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Register Firebug string bundle just once + register cookie bundle sooner

  • Loading branch information...
commit e0e71af2248ca2152e3594f563b51bf58fcdb1e8 1 parent f1419db
Jan Odvarko authored June 08, 2012
4  extension/content/firebug/cookies/cookieModule.js
@@ -70,10 +70,6 @@ const panelName = "cookies";
70 70
 // Helper array for prematurely created contexts
71 71
 var contexts = new Array();
72 72
 
73  
-// Extend string bundle with new strings for this extension.
74  
-// This must be done yet before domplate definitions.
75  
-Firebug.registerStringBundle("chrome://firebug/locale/cookies.properties");
76  
-
77 73
 // Register stylesheet in Firebug. This method is introduced in Firebug 1.6
78 74
 Firebug.registerStylesheet("chrome://firebug/skin/cookies/cookies.css");
79 75
 
12  extension/content/firebug/firebug.js
@@ -75,18 +75,6 @@ var defaultFuncRep = null;
75 75
 var menuItemControllers = [];
76 76
 var panelTypeMap = {};
77 77
 
78  
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
79  
-
80  
-try
81  
-{
82  
-    // Register default Firebug string bundle (yet before domplate templates).
83  
-    Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
84  
-}
85  
-catch (exc)
86  
-{
87  
-    dump("Register default string bundle FAILS: "+exc+"\n");
88  
-}
89  
-
90 78
 // ********************************************************************************************* //
91 79
 
92 80
 if (window.Firebug)
7  extension/content/firebug/firefox/browserOverlay.js
@@ -27,9 +27,16 @@ var firebugURLs =
27 27
     firstRunPage: "http://getfirebug.com/firstrun#Firebug "
28 28
 };
29 29
 
  30
+// ********************************************************************************************* //
  31
+// String Bundles
  32
+
30 33
 // Register bundle yet before any Locale.$STR* API is used.
31 34
 Locale.registerStringBundle("chrome://firebug/locale/firebug.properties");
32 35
 
  36
+// xxxHonza: this needs to be done befor firebug/cookies modules are loaded
  37
+// and it should be part of the cookies directory.
  38
+Locale.registerStringBundle("chrome://firebug/locale/cookies.properties");
  39
+
33 40
 // ********************************************************************************************* //
34 41
 // Overlay Helpers
35 42
 

0 notes on commit e0e71af

Please sign in to comment.
Something went wrong with that request. Please try again.