Bug 727929 - test_idcheck.xul > preferences.xul: doubled 'languageBundle' and 'regionBundle'. r=IanN
authorJens Hatlak <jh@junetz.de>
Sun, 19 Feb 2012 22:39:58 +0100
changeset 10863 3b59be34ef07fcda4080f7cc974088b43c291b59
parent 10862 7a6f61989748ec0858fa0e763ac1bab59c0be3dd
child 10864 837541d5646a9bb22d9abc969ddb5d36f25d4abf
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs727929
Bug 727929 - test_idcheck.xul > preferences.xul: doubled 'languageBundle' and 'regionBundle'. r=IanN
suite/common/pref/pref-appearance.js
suite/common/pref/pref-appearance.xul
suite/common/pref/pref-applications.xul
suite/common/pref/pref-languages-add.xul
suite/common/pref/pref-languages.js
suite/common/pref/pref-languages.xul
suite/common/pref/pref-spelling.js
suite/common/pref/pref-spelling.xul
suite/common/pref/preferences.xul
suite/mailnews/compose/prefs/pref-composing_messages.xul
suite/mailnews/prefs/pref-junk.xul
--- a/suite/common/pref/pref-appearance.js
+++ b/suite/common/pref/pref-appearance.js
@@ -47,18 +47,18 @@ function Startup()
  */
 function SwitchLocales_Load() {
   var menulist = document.getElementById("switchLocales");
   var pref = document.getElementById("general.useragent.locale");
 
   var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
                      .getService(Components.interfaces.nsIToolkitChromeRegistry);
 
-  var langNames = document.getElementById("langNamesBundle");
-  var regNames  = document.getElementById("regNamesBundle");
+  var langNames = document.getElementById("languageNamesBundle");
+  var regNames  = document.getElementById("regionNamesBundle");
 
   var locales = cr.getLocalesForPackage("global");
 
   while (locales.hasMore()) {
     var locale = locales.getNext();
 
     var parts = locale.split(/-/);
 
--- a/suite/common/pref/pref-appearance.xul
+++ b/suite/common/pref/pref-appearance.xul
@@ -58,23 +58,16 @@
       <preference id="browser.chrome.toolbar_tips"
                   name="browser.chrome.toolbar_tips"
                   type="bool"/>
       <preference id="general.useragent.locale"
                   name="general.useragent.locale"
                   type="string"/>
     </preferences>
 
-    <stringbundleset id="prefAppearanceBundleset">
-      <stringbundle id="langNamesBundle"
-                    src="chrome://global/locale/languageNames.properties"/>
-      <stringbundle id="regNamesBundle"
-                    src="chrome://global/locale/regionNames.properties"/>
-    </stringbundleset>
-
     <groupbox id="generalStartupPreferences" align="start">
       <caption label="&onStartLegend.label;"/>
 
       <checkbox id="generalStartupBrowser"
                 label="&navCheck.label;"
                 accesskey="&navCheck.accesskey;"
                 preference="general.startup.browser"/>
     </groupbox>
--- a/suite/common/pref/pref-applications.xul
+++ b/suite/common/pref/pref-applications.xul
@@ -93,19 +93,22 @@
                   name="browser.audioFeeds.handlers.webservice"
                   type="string"/>
 
       <preference id="pref.downloads.disable_button.edit_actions"
                   name="pref.downloads.disable_button.edit_actions"
                   type="bool"/>
     </preferences>
 
-    <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
-    <stringbundle id="bundlePrefApplications"
-                  src="chrome://communicator/locale/pref/pref-applications.properties"/>
+    <stringbundleset id="appBundleset">
+       <stringbundle id="bundleBrand"
+                     src="chrome://branding/locale/brand.properties"/>
+       <stringbundle id="bundlePrefApplications"
+                     src="chrome://communicator/locale/pref/pref-applications.properties"/>
+    </stringbundleset>
 
     <hbox align="center">
       <textbox id="filter"
                flex="1"
                type="search"
                placeholder="&search.placeholder;"
                clickSelectsAll="true"
                aria-controls="handlersView"
--- a/suite/common/pref/pref-languages-add.xul
+++ b/suite/common/pref/pref-languages-add.xul
@@ -57,18 +57,20 @@
 
   <prefpane id="addLanguagesPane">
     <preferences id="addLanguages">
       <preference id="intl.accept_languages"
                   name="intl.accept_languages"
                   type="wstring"/>
     </preferences>
 
-    <stringbundle id="prefLangAddBundle"
-                  src="chrome://communicator/locale/pref/pref-languages.properties"/>
+    <stringbundleset id="langAddBundleset">
+      <stringbundle id="prefLangAddBundle"
+                    src="chrome://communicator/locale/pref/pref-languages.properties"/>
+    </stringbundleset>
  
     <description style="width: 1px;">&languages.customize.prefAddLangDescript;</description>
     <separator class="thin"/>
     <description style="width: 1px;">&languages.customize.available.label;</description>
  
     <listbox id="availableLanguages"
              flex="1"
              seltype="multiple"
--- a/suite/common/pref/pref-languages.js
+++ b/suite/common/pref/pref-languages.js
@@ -61,19 +61,19 @@ function Startup()
 function AddLanguage()
 {
   document.documentElement.openSubDialog("chrome://communicator/content/pref/pref-languages-add.xul", "addlangwindow", gLanguageNames);
 }
 
 function ReadAvailableLanguages()
 {
   var i = 0;
-  var languagesBundle = document.getElementById("languagesBundle");
+  var languagesBundle = document.getElementById("languageNamesBundle");
   var prefLangBundle = document.getElementById("prefLangBundle");
-  var regionsBundle = document.getElementById("regionsBundle");
+  var regionsBundle = document.getElementById("regionNamesBundle");
   var langStrings = document.getElementById("acceptedBundle").strings;
 
   while (langStrings.hasMoreElements())
   {
     // Progress through the bundle.
     var curItem = langStrings.getNext();
 
     if (!(curItem instanceof Components.interfaces.nsIPropertyElement))
--- a/suite/common/pref/pref-languages.xul
+++ b/suite/common/pref/pref-languages.xul
@@ -62,24 +62,22 @@
       <preference id="pref.browser.language.disable_button.remove"
                   name="pref.browser.language.disable_button.remove"
                   type="bool"/>
       <preference id="intl.charset.default"
                   name="intl.charset.default"
                   type="wstring"/>
     </preferences>
 
-    <stringbundle id="acceptedBundle"
-                  src="resource://gre/res/language.properties"/>
-    <stringbundle id="languagesBundle"
-                  src="chrome://global/locale/languageNames.properties"/>
-    <stringbundle id="regionsBundle"
-                  src="chrome://global/locale/regionNames.properties"/>
-    <stringbundle id="prefLangBundle"
-                  src="chrome://communicator/locale/pref/pref-languages.properties"/>
+    <stringbundleset id="langBundleset">
+      <stringbundle id="acceptedBundle"
+                    src="resource://gre/res/language.properties"/>
+      <stringbundle id="prefLangBundle"
+                    src="chrome://communicator/locale/pref/pref-languages.properties"/>
+    </stringbundleset>
 
     <groupbox flex="1">
       <caption label="&langtitle.label;"/>
       <description>&languages.customize.prefLangDescript;</description>
       <label accesskey="&languages.customize.active.accesskey;"
              control="activeLanguages">&languages.customize.active.label;</label>
       <hbox flex="1">
         <listbox id="activeLanguages"
--- a/suite/common/pref/pref-spelling.js
+++ b/suite/common/pref/pref-spelling.js
@@ -36,21 +36,21 @@ function InitLanguageMenu() {
 
   // Store current dictionary count.
   gDictCount = count;
 
   // Load the string bundles that will help us map
   // RFC 1766 strings to UI strings.
 
   // Load the language string bundle.
-  var languageBundle = document.getElementById("languageBundle");
+  var languageBundle = document.getElementById("languageNamesBundle");
   var regionBundle = null;
   // If we have a language string bundle, load the region string bundle.
   if (languageBundle)
-    regionBundle = document.getElementById("regionBundle");
+    regionBundle = document.getElementById("regionNamesBundle");
   
   var menuStr2;
   var isoStrArray;
   var langId;
   var langLabel;
 
   for (let i = 0; i < count; i++) {
     try {
--- a/suite/common/pref/pref-spelling.xul
+++ b/suite/common/pref/pref-spelling.xul
@@ -6,21 +6,16 @@
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-spelling.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <prefpane id="spelling_pane"
             label="&prefSpelling.title;"
             script="chrome://communicator/content/pref/pref-spelling.js">
 
-    <stringbundle id="languageBundle"
-                  src="chrome://global/locale/languageNames.properties"/>
-    <stringbundle id="regionBundle"
-                  src="chrome://global/locale/regionNames.properties"/>
-
     <preferences id="spelling_preferences">
       <preference id="mail.SpellCheckBeforeSend"
                   name="mail.SpellCheckBeforeSend"
                   type="bool"/>
       <preference id="mail.spellcheck.inline"
                   name="mail.spellcheck.inline"
                   type="bool"/>
       <preference id="spellchecker.dictionary"
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -55,18 +55,24 @@
             buttons="accept,cancel,help"
             autopanes="true"> 
 
   <script type="application/javascript" src="chrome://communicator/content/pref/preferences.js"/>
   <!-- Used by pref-smartupdate, pref-security, pref-cookies, pref-images, pref-popups and pref-passwords, as well as pref-sync (gSyncUtils.*open* -> openUILinkIn) -->
   <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
   <script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
 
-  <stringbundle id="bundle_prefutilities"
-                src="chrome://communicator/locale/pref/prefutilities.properties"/>
+  <stringbundleset id="prefBundleset">
+    <stringbundle id="bundle_prefutilities"
+                  src="chrome://communicator/locale/pref/prefutilities.properties"/>
+    <stringbundle id="languageNamesBundle"
+                  src="chrome://global/locale/languageNames.properties"/>
+    <stringbundle id="regionNamesBundle"
+                  src="chrome://global/locale/regionNames.properties"/>
+  </stringbundleset>
 
   <tree id="prefsTree"
         style="width: 13em;"
         seltype="single"
         hidecolumnpicker="true"
         hidden="true"
         flex="1">
     <treecols>
--- a/suite/mailnews/compose/prefs/pref-composing_messages.xul
+++ b/suite/mailnews/compose/prefs/pref-composing_messages.xul
@@ -45,21 +45,16 @@
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <prefpane id="composing_messages_pane"
             label="&pref.composing.messages.title;"
             script="chrome://messenger/content/messengercompose/pref-composing_messages.js"
             onpaneload="this.PopulateFonts();">
 
-    <stringbundle id="languageBundle"
-                  src="chrome://global/locale/languageNames.properties"/>
-    <stringbundle id="regionBundle"
-                  src="chrome://global/locale/regionNames.properties"/>
-
     <preferences id="composing_messages_preferences">
       <preference id="mail.forward_message_mode"
                   name="mail.forward_message_mode"
                   type="int"/>
       <preference id="mail.reply_quote_inline"
                   name="mail.reply_quote_inline"
                   type="bool"/>
       <preference id="mail.compose.autosave"
--- a/suite/mailnews/prefs/pref-junk.xul
+++ b/suite/mailnews/prefs/pref-junk.xul
@@ -75,18 +75,20 @@
       <preference id="mail.phishing.detection.enabled"
                   name="mail.phishing.detection.enabled"
                   type="bool"/>
       <preference id="mailnews.downloadToTempFile"
                   name="mailnews.downloadToTempFile"
                   type="bool"/>
     </preferences>
 
-    <stringbundle id="bundleJunkPreferences"
-                  src="chrome://messenger/locale/messenger.properties"/>
+    <stringbundleset id="junkBundleset">
+      <stringbundle id="bundleJunkPreferences"
+                    src="chrome://messenger/locale/messenger.properties"/>
+    </stringbundleset>
 
     <groupbox>
       <caption label="&junkSettings.caption;"/>
       <description>&junkMail.intro;</description>
       <class separator="thin"/>
 
       <checkbox id="manualMark"
               label="&manualMark.label;"