Changeset 826c34

Timestamp:

Nov 26, 2011, 8:20:08 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

018766

Parents:

f29419

Message:

replaced bundleString-Objects with inline code

Files:

• content/bindings/v_identity.xml (modified) (1 diff)
• content/prefDialog/vI_prefDialog.xul (modified) (1 diff)
• content/vI_getHeader.js (modified) (1 diff)
• content/vI_rdfDataEditor.js (modified) (2 diffs)
• content/vI_rdfDataEditor.xul (modified) (1 diff)
• content/vI_rdfDataTree.js (modified) (3 diffs)
• content/vI_rdfDataTree.xul (modified) (1 diff)
• content/vI_smartReplyDialog.js (modified) (1 diff)
• content/vI_smartReplyDialog.xul (modified) (1 diff)
• content/vI_upgrade.js (modified) (1 diff)
• content/vI_upgrade.xul (modified) (1 diff)
• modules/vI_account.js (modified) (1 diff)

content/bindings/v_identity.xml

@@ -197 +197 @@
         listitem.setAttribute("class", "menuitem-non-iconic");
         listitem.setAttribute("type", "non-iconic-noaccel");
-        listitem.setAttribute("label", document.getElementById("bundle_messenger").getString("defaultServerTag"));
+        listitem.setAttribute("label", 
+          Components.classes["@mozilla.org/intl/stringbundle;1"]
+            .getService(Components.interfaces.nsIStringBundleService)
+            .createBundle("chrome://messenger/locale/messenger.properties")
+            .GetStringFromName("defaultServerTag"));
         this._smtpPopup.appendChild(listitem);
         this._smtpMenu.selectedItem = listitem;

content/prefDialog/vI_prefDialog.xul

@@ -49 +49 @@
 
 <dialog id="vI_prefDialog">
-
-<stringbundleset id="stringbundleset">
-    <stringbundle id="vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-</stringbundleset>
 
 <broadcaster id="VIdent_broadcaster_doFcc"/>

content/vI_getHeader.js

@@ -110 +110 @@
     
     setupEventListener: function() {
-        
-        getHeader.strings = document.getElementById("virtualIdentityExtension_vIdentBundle");
-        
         getHeader.unicodeConverter.charset = "UTF-8";
         

content/vI_rdfDataEditor.js

@@ -39 +39 @@
     __populateIdentityMenu : function() {
         var listitem = document.createElement("menuitem");
-//      listitem.setAttribute("label", document.getElementById("bundle_messenger").getString("defaultServerTag"));
         listitem.setAttribute("label", "");
         document.getElementById("identity_list_popup").appendChild(listitem);
@@ -67 +66 @@
         for each (var typeField in Array("email", "maillist", "newsgroup", "filter")) {
             var menuitem = document.createElement("menuitem");
-            var label = document.getElementById("vI_rdfDataTreeBundle").getString("vI_rdfDataTree.dataType." + typeField)
+            var label = Components.classes["@mozilla.org/intl/stringbundle;1"]
+              .getService(Components.interfaces.nsIStringBundleService)
+              .createBundle("chrome://v_identity/locale/vI_rdfDataEditor.properties")
+              .GetStringFromName("vI_rdfDataTree.dataType." + typeField);
             menuitem.setAttribute("label", label);
             menuitem.setAttribute("key", typeField);

content/vI_rdfDataEditor.xul

@@ -40 +40 @@
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" />
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
-  </stringbundleset>
-
-<!-- <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" /> -->
 
     <dialogheader title="&vI_rdfDataEditor.header.label;"/>

content/vI_rdfDataTree.js

@@ -201 +201 @@
     init : function() {
         rdfDataTreeCollection.tabbox = document.getElementById("TreeTabbox");
-        rdfDataTreeCollection._strings = document.getElementById("vI_rdfDataTreeBundle");
+        rdfDataTreeCollection._strings = Components.classes["@mozilla.org/intl/stringbundle;1"]
+          .getService(Components.interfaces.nsIStringBundleService)
+          .createBundle("chrome://v_identity/locale/vI_rdfDataEditor.properties");
 
         rdfDataTreeCollection._rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf");
@@ -318 +320 @@
         if (tree.treeElem.view.selection.count == 0) return;
         if (tree.treeElem.view.selection.count > 5) {
-            var warning = rdfDataTreeCollection._strings.getString("vI_rdfDataTree.modify.Warning1") + " " +
+            var warning = rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.modify.Warning1") + " " +
                 tree.treeElem.view.selection.count + " " +
-                rdfDataTreeCollection._strings.getString("vI_rdfDataTree.modify.Warning2")
+                rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.modify.Warning2")
             if (!rdfDataTreeCollection.promptService.confirm(window,"Warning",warning)) return;
         }
@@ -351 +353 @@
         var tree = rdfDataTreeCollection.trees[treeType];
         if (tree.treeElem.view.selection.count == 0) return;
-        var warning = rdfDataTreeCollection._strings.getString("vI_rdfDataTree.remove.Warning1") + " " +
+        var warning = rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.remove.Warning1") + " " +
             tree.treeElem.view.selection.count + " " +
-            rdfDataTreeCollection._strings.getString("vI_rdfDataTree.remove.Warning2")
+            rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.remove.Warning2")
         
         if (!rdfDataTreeCollection.promptService.confirm(window,"Warning",warning)) return;

content/vI_rdfDataTree.xul

@@ -63 +63 @@
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataTree.js" />
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
-
-<stringbundleset id="stringbundleset">
-    <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" />
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
-    <stringbundle id="virtualIdentityExtension_vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
-    <stringbundle id="virtualIdentityExtension_vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
-</stringbundleset>
 
 <menupopup hidden="true">  <!--just to hold the localized labels-->

content/vI_smartReplyDialog.js

@@ -41 +41 @@
             if (smartReply_dialog.all_addresses.identityDataCollection[index].smtp)
                 smtp = smartReply_dialog.all_addresses.identityDataCollection[index].smtp.value;
-
-            menuentry += (id?" (" + id + "," + 
-                    (smtp?smtp:document.getElementById("bundle_messenger").getString("defaultServerTag")) +
-                    ")":"")
+            
+            let defaultServerTag = Components.classes["@mozilla.org/intl/stringbundle;1"]
+              .getService(Components.interfaces.nsIStringBundleService)
+              .createBundle("chrome://messenger/locale/messenger.properties")
+              .GetStringFromName("defaultServerTag")
+            
+            menuentry += (id?" (" + id + "," + (smtp?smtp:defaultServerTag) + ")":"")
             smartReply_dialog.add_row(menuentry);
         }

content/vI_smartReplyDialog.xul

@@ -39 +39 @@
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_smartReplyDialog.js" />
 
-<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-
 <broadcaster id="VIdent_broadcaster_doFcc"/>
 

content/vI_upgrade.js

@@ -85 +85 @@
         var browser = document.getElementById('virtualIdentityExtension_TextBox.' + pageid)
         if (browser) 
-            browser.outputString =
-                    document.getElementById('virtualIdentityExtension_TextBoxBundle').getString('vident.' + pageid);
+            browser.outputString = Components.classes["@mozilla.org/intl/stringbundle;1"]
+            .getService(Components.interfaces.nsIStringBundleService)
+            .createBundle("chrome://v_identity/locale/vI_upgrade.properties")
+            .GetStringFromName('vident.' + pageid);
     },
     

content/vI_upgrade.xul

@@ -43 +43 @@
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
 
-<stringbundle id="virtualIdentityExtension_TextBoxBundle" src="chrome://v_identity/locale/vI_upgrade.properties" />
-<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
-    
+
     <wizardpage id="introPage"
         label="&vident.upgrade.intro.label;" description="&vident.upgrade.intro.description;"

modules/vI_account.js

@@ -95 +95 @@
         if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) Log.error("\nfailed check for email.\n");
         if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) Log.error("\nfailed check for SMTP.\n");
-        alert(stringBundle.getStringFromName("vident.genericSendMessage.error"));
+        alert(stringBundle.GetStringFromName("vident.genericSendMessage.error"));
         return false
     }