Changeset 826c34


Ignore:
Timestamp:
Nov 26, 2011, 8:20:08 PM (9 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
018766
Parents:
f29419
Message:

replaced bundleString-Objects with inline code

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/v_identity.xml

    rf29419 r826c34  
    197197        listitem.setAttribute("class", "menuitem-non-iconic");
    198198        listitem.setAttribute("type", "non-iconic-noaccel");
    199         listitem.setAttribute("label", document.getElementById("bundle_messenger").getString("defaultServerTag"));
     199        listitem.setAttribute("label",
     200          Components.classes["@mozilla.org/intl/stringbundle;1"]
     201            .getService(Components.interfaces.nsIStringBundleService)
     202            .createBundle("chrome://messenger/locale/messenger.properties")
     203            .GetStringFromName("defaultServerTag"));
    200204        this._smtpPopup.appendChild(listitem);
    201205        this._smtpMenu.selectedItem = listitem;
  • content/prefDialog/vI_prefDialog.xul

    rf29419 r826c34  
    4949
    5050<dialog id="vI_prefDialog">
    51 
    52 <stringbundleset id="stringbundleset">
    53     <stringbundle id="vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
    54     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
    55 </stringbundleset>
    5651
    5752<broadcaster id="VIdent_broadcaster_doFcc"/>
  • content/vI_getHeader.js

    rf29419 r826c34  
    110110   
    111111    setupEventListener: function() {
    112        
    113         getHeader.strings = document.getElementById("virtualIdentityExtension_vIdentBundle");
    114        
    115112        getHeader.unicodeConverter.charset = "UTF-8";
    116113       
  • content/vI_rdfDataEditor.js

    rf29419 r826c34  
    3939    __populateIdentityMenu : function() {
    4040        var listitem = document.createElement("menuitem");
    41 //      listitem.setAttribute("label", document.getElementById("bundle_messenger").getString("defaultServerTag"));
    4241        listitem.setAttribute("label", "");
    4342        document.getElementById("identity_list_popup").appendChild(listitem);
     
    6766        for each (var typeField in Array("email", "maillist", "newsgroup", "filter")) {
    6867            var menuitem = document.createElement("menuitem");
    69             var label = document.getElementById("vI_rdfDataTreeBundle").getString("vI_rdfDataTree.dataType." + typeField)
     68            var label = Components.classes["@mozilla.org/intl/stringbundle;1"]
     69              .getService(Components.interfaces.nsIStringBundleService)
     70              .createBundle("chrome://v_identity/locale/vI_rdfDataEditor.properties")
     71              .GetStringFromName("vI_rdfDataTree.dataType." + typeField);
    7072            menuitem.setAttribute("label", label);
    7173            menuitem.setAttribute("key", typeField);
  • content/vI_rdfDataEditor.xul

    rf29419 r826c34  
    4040<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
    4141
    42   <stringbundleset id="stringbundleset">
    43     <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" />
    44     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
    45   </stringbundleset>
    46 
    47 <!-- <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" /> -->
    4842
    4943    <dialogheader title="&vI_rdfDataEditor.header.label;"/>
  • content/vI_rdfDataTree.js

    rf29419 r826c34  
    201201    init : function() {
    202202        rdfDataTreeCollection.tabbox = document.getElementById("TreeTabbox");
    203         rdfDataTreeCollection._strings = document.getElementById("vI_rdfDataTreeBundle");
     203        rdfDataTreeCollection._strings = Components.classes["@mozilla.org/intl/stringbundle;1"]
     204          .getService(Components.interfaces.nsIStringBundleService)
     205          .createBundle("chrome://v_identity/locale/vI_rdfDataEditor.properties");
    204206
    205207        rdfDataTreeCollection._rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf");
     
    318320        if (tree.treeElem.view.selection.count == 0) return;
    319321        if (tree.treeElem.view.selection.count > 5) {
    320             var warning = rdfDataTreeCollection._strings.getString("vI_rdfDataTree.modify.Warning1") + " " +
     322            var warning = rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.modify.Warning1") + " " +
    321323                tree.treeElem.view.selection.count + " " +
    322                 rdfDataTreeCollection._strings.getString("vI_rdfDataTree.modify.Warning2")
     324                rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.modify.Warning2")
    323325            if (!rdfDataTreeCollection.promptService.confirm(window,"Warning",warning)) return;
    324326        }
     
    351353        var tree = rdfDataTreeCollection.trees[treeType];
    352354        if (tree.treeElem.view.selection.count == 0) return;
    353         var warning = rdfDataTreeCollection._strings.getString("vI_rdfDataTree.remove.Warning1") + " " +
     355        var warning = rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.remove.Warning1") + " " +
    354356            tree.treeElem.view.selection.count + " " +
    355             rdfDataTreeCollection._strings.getString("vI_rdfDataTree.remove.Warning2")
     357            rdfDataTreeCollection._strings.GetStringFromName("vI_rdfDataTree.remove.Warning2")
    356358       
    357359        if (!rdfDataTreeCollection.promptService.confirm(window,"Warning",warning)) return;
  • content/vI_rdfDataTree.xul

    rf29419 r826c34  
    6363<script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataTree.js" />
    6464<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
    65 
    66 <stringbundleset id="stringbundleset">
    67     <stringbundle id="vI_rdfDataTreeBundle" src="chrome://v_identity/locale/vI_rdfDataEditor.properties" />
    68     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
    69     <stringbundle id="virtualIdentityExtension_vIdentBundle" src="chrome://v_identity/locale/v_identity.properties" />
    70     <stringbundle id="virtualIdentityExtension_vIStorageExtrasBundle" src="chrome://v_identity/locale/vI_storageExtras.properties" />
    71 </stringbundleset>
    7265
    7366<menupopup hidden="true">  <!--just to hold the localized labels-->
  • content/vI_smartReplyDialog.js

    rf29419 r826c34  
    4141            if (smartReply_dialog.all_addresses.identityDataCollection[index].smtp)
    4242                smtp = smartReply_dialog.all_addresses.identityDataCollection[index].smtp.value;
    43 
    44             menuentry += (id?" (" + id + "," +
    45                     (smtp?smtp:document.getElementById("bundle_messenger").getString("defaultServerTag")) +
    46                     ")":"")
     43           
     44            let defaultServerTag = Components.classes["@mozilla.org/intl/stringbundle;1"]
     45              .getService(Components.interfaces.nsIStringBundleService)
     46              .createBundle("chrome://messenger/locale/messenger.properties")
     47              .GetStringFromName("defaultServerTag")
     48           
     49            menuentry += (id?" (" + id + "," + (smtp?smtp:defaultServerTag) + ")":"")
    4750            smartReply_dialog.add_row(menuentry);
    4851        }
  • content/vI_smartReplyDialog.xul

    rf29419 r826c34  
    3939<script type="application/x-javascript" src="chrome://v_identity/content/vI_smartReplyDialog.js" />
    4040
    41 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
    42 
    4341<broadcaster id="VIdent_broadcaster_doFcc"/>
    4442
  • content/vI_upgrade.js

    rf29419 r826c34  
    8585        var browser = document.getElementById('virtualIdentityExtension_TextBox.' + pageid)
    8686        if (browser)
    87             browser.outputString =
    88                     document.getElementById('virtualIdentityExtension_TextBoxBundle').getString('vident.' + pageid);
     87            browser.outputString = Components.classes["@mozilla.org/intl/stringbundle;1"]
     88            .getService(Components.interfaces.nsIStringBundleService)
     89            .createBundle("chrome://v_identity/locale/vI_upgrade.properties")
     90            .GetStringFromName('vident.' + pageid);
    8991    },
    9092   
  • content/vI_upgrade.xul

    rf29419 r826c34  
    4343<script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
    4444
    45 <stringbundle id="virtualIdentityExtension_TextBoxBundle" src="chrome://v_identity/locale/vI_upgrade.properties" />
    46 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties" />
    47    
     45
    4846    <wizardpage id="introPage"
    4947        label="&vident.upgrade.intro.label;" description="&vident.upgrade.intro.description;"
  • modules/vI_account.js

    rf29419 r826c34  
    9595        if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) Log.error("\nfailed check for email.\n");
    9696        if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) Log.error("\nfailed check for SMTP.\n");
    97         alert(stringBundle.getStringFromName("vident.genericSendMessage.error"));
     97        alert(stringBundle.GetStringFromName("vident.genericSendMessage.error"));
    9898        return false
    9999    }   
Note: See TracChangeset for help on using the changeset viewer.