Index: xpfe/browser/resources/locale/en-US/navigator.properties
===================================================================
RCS file: /cvsroot/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties,v
retrieving revision 1.50
diff -u -w -b -r1.50 navigator.properties
--- navigator.properties 2001/05/25 23:56:34 1.50
+++ navigator.properties 2001/06/06 01:38:50
@@ -16,6 +16,7 @@
# all.js
#
general.useragent.locale=en-US
+general.useragent.contentlocale=US
intl.accept_languages=en-us
intl.charsetmenu.browser.static=iso-8859-1
intl.charsetmenu.browser.more1=iso-8859-1, iso-8859-15, ibm850, x-mac-roman, windows-1252, iso-8859-14, iso-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, iso-8859-10, iso-8859-3
Index: xpfe/components/jar.mn
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/jar.mn,v
retrieving revision 1.34
diff -u -w -b -r1.34 jar.mn
--- jar.mn 2001/05/23 06:41:53 1.34
+++ jar.mn 2001/06/06 01:38:50
@@ -22,6 +22,7 @@
content/communicator/pref/pref-cache.xul (prefwindow/resources/content/pref-cache.xul)
content/communicator/pref/pref-colors.js (prefwindow/resources/content/pref-colors.js)
content/communicator/pref/pref-colors.xul (prefwindow/resources/content/pref-colors.xul)
+ content/communicator/pref/pref-content.xul (prefwindow/resources/content/pref-content.xul)
content/communicator/pref/pref-themes.xul (prefwindow/resources/content/pref-themes.xul)
content/communicator/pref/pref-themes.js (prefwindow/resources/content/pref-themes.js)
content/communicator/pref/pref-charset.js (prefwindow/resources/content/pref-charset.js)
@@ -101,6 +102,7 @@
locale/en-US/communicator/pref/pref-cache.dtd (prefwindow/resources/locale/en-US/pref-cache.dtd)
locale/en-US/communicator/pref/pref-charset.dtd (prefwindow/resources/locale/en-US/pref-charset.dtd)
locale/en-US/communicator/pref/pref-colors.dtd (prefwindow/resources/locale/en-US/pref-colors.dtd)
+ locale/en-US/communicator/pref/pref-content.dtd (prefwindow/resources/locale/en-US/pref-content.dtd)
locale/en-US/communicator/pref/pref-themes.dtd (prefwindow/resources/locale/en-US/pref-themes.dtd)
locale/en-US/communicator/pref/pref-download.dtd (prefwindow/resources/locale/en-US/pref-download.dtd)
locale/en-US/communicator/pref/pref-debug.dtd (prefwindow/resources/locale/en-US/pref-debug.dtd)
Index: xpfe/components/prefwindow/resources/content/MANIFEST
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/content/MANIFEST,v
retrieving revision 1.36
diff -u -w -b -r1.36 MANIFEST
--- MANIFEST 2001/05/19 15:44:10 1.36
+++ MANIFEST 2001/06/06 01:38:51
@@ -13,6 +13,7 @@
pref-calibrate-screen.xul
pref-colors.js
pref-colors.xul
+pref-content.xul
pref-themes.xul
pref-themes.js
pref-debug.xul
Index: xpfe/components/prefwindow/resources/content/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/content/makefile.win,v
retrieving revision 1.40
diff -u -w -b -r1.40 makefile.win
--- makefile.win 2001/05/19 15:44:10 1.40
+++ makefile.win 2001/06/06 01:38:51
@@ -39,6 +39,7 @@
.\pref-cache.xul \
.\pref-colors.js \
.\pref-colors.xul \
+ .\pref-content.xul \
.\pref-themes.xul \
.\pref-themes.js \
.\pref-charset.js \
Index: xpfe/components/prefwindow/resources/content/nsPrefWindow.js
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/content/nsPrefWindow.js,v
retrieving revision 1.21
diff -u -w -b -r1.21 nsPrefWindow.js
--- nsPrefWindow.js 2001/05/15 03:48:51 1.21
+++ nsPrefWindow.js 2001/06/06 01:38:51
@@ -142,6 +142,9 @@
case "int":
return !aDefaultFlag ? pref.GetIntPref( aPrefString ) : pref.GetDefaultIntPref( aPrefString );
break;
+ case "localizedstring":
+ return pref.getLocalizedUnicharPref( aPrefString );
+ break;
case "color":
case "string":
default:
@@ -186,6 +189,7 @@
hPrefWindow.pref.SetIntPref( aPrefString, aValue );
break;
case "color":
+ case "localizedstring":
case "string":
default:
hPrefWindow.pref.SetUnicharPref( aPrefString, aValue );
@@ -230,6 +234,7 @@
dump("*** ERROR CASE: illegal attempt to set an empty color pref. ignoring.\n");
break;
}
+ case "localizedstring":
case "string":
default:
if( typeof(value) != "string" )
@@ -298,8 +303,9 @@
case "int":
prefvalue = this.getPref( preftype, prefstring );
break;
- case "string":
+ case "localizedstring":
case "color":
+ case "string":
default:
prefvalue = this.getPref( preftype, prefstring );
break;
Index: xpfe/components/prefwindow/resources/content/pref-appearance.xul
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul,v
retrieving revision 1.34
diff -u -w -b -r1.34 pref-appearance.xul
--- pref-appearance.xul 2001/04/05 19:52:55 1.34
+++ pref-appearance.xul 2001/06/06 01:38:51
@@ -42,7 +42,46 @@
var panel = "chrome://communicator/content/pref/pref-appearance.xul";
// the first elements in this array will be poked from chromeregistry loaded
// overlays once overlays.rdf works properly
- var _elementIDs = ["generalStartupBrowser", "showHideTooltips"];
+ var _elementIDs = ["generalStartupBrowser", "showHideTooltips", "languageList"];
+
+ function Startup()
+ {
+ parent.hPrefWindow.registerOKCallbackFunc( switchUILanguage );
+ }
+
+ function switchUILanguage()
+ {
+
+ var oldLangCode = parent.hPrefWindow.getPref( "string", "general.useragent.locale");
+ var newLangCode;
+
+ try {
+ var languageList = document.getElementById('languageList');
+ if (languageList) {
+ newLangCode = languageList.selectedItem.value;
+ } else {
+ var newLangCode = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://communicator/content/pref/pref-appearance.xul", "languageList" ).value;
+ }
+ }
+ catch (e) {}
+
+ if (newLangCode != oldLangCode)
+ {
+ try {
+ var chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService();
+ if ( chromeRegistry ) {
+ chromeRegistry = chromeRegistry.QueryInterface( Components.interfaces.nsIChromeRegistry );
+ }
+ chromeRegistry.selectLocale(newLangCode, true);
+ dump("\n --> selectLocale(" + newLangCode + ") --\n");
+ }
+ catch(e) {
+ dump(e + "\n");
+ return false;
+ }
+ }
+ return true;
+ }
]]>
@@ -71,11 +110,45 @@
-
+
+
+
+
+
+
+
+
+ &languageList.txt.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: xpfe/components/prefwindow/resources/content/pref-content.xul
===================================================================
RCS file: pref-content.xul
diff -N pref-content.xul
--- /dev/null Wed Apr 26 15:53:02 2000
+++ pref-content.xul Tue Jun 5 18:38:51 2001
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+%brandDTD;
+
+%prefContentDTD;
+]>
+
+
+
+
+
+
+
+
+
+
+
+ &contentIntro.label;
+
+ &installedContentPacks.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: xpfe/components/prefwindow/resources/content/preftree.xul
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul,v
retrieving revision 1.79
diff -u -w -b -r1.79 preftree.xul
--- preftree.xul 2001/05/16 04:43:04 1.79
+++ preftree.xul 2001/06/06 01:38:51
@@ -61,6 +61,11 @@
+
+
+
+
+
Index: xpfe/components/prefwindow/resources/locale/en-US/MANIFEST
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/MANIFEST,v
retrieving revision 1.26
diff -u -w -b -r1.26 MANIFEST
--- MANIFEST 2001/04/01 02:30:27 1.26
+++ MANIFEST 2001/06/06 01:38:51
@@ -6,6 +6,7 @@
pref-cache.dtd
pref-charset.dtd
pref-colors.dtd
+pref-content.dtd
pref-themes.dtd
pref-debug.dtd
pref-debug1.dtd
Index: xpfe/components/prefwindow/resources/locale/en-US/makefile.win
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/makefile.win,v
retrieving revision 1.31
diff -u -w -b -r1.31 makefile.win
--- makefile.win 2001/03/19 23:09:54 1.31
+++ makefile.win 2001/06/06 01:38:51
@@ -35,6 +35,7 @@
.\pref-cache.dtd \
.\pref-charset.dtd \
.\pref-colors.dtd \
+ .\pref-content.dtd \
.\pref-themes.dtd \
.\pref-download.dtd \
.\pref-debug.dtd \
Index: xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd,v
retrieving revision 1.14
diff -u -w -b -r1.14 pref-appearance.dtd
--- pref-appearance.dtd 2001/04/05 19:53:01 1.14
+++ pref-appearance.dtd 2001/06/06 01:38:51
@@ -3,11 +3,21 @@
+
+
+
+
@@ -25,3 +35,4 @@
+
Index: xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd,v
retrieving revision 1.35
diff -u -w -b -r1.35 preftree.dtd
--- preftree.dtd 2001/05/16 04:43:06 1.35
+++ preftree.dtd 2001/06/06 01:38:51
@@ -4,6 +4,7 @@
+
Index: xpfe/components/prefwindow/resources/locale/en-US/prefutilities.properties
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/prefutilities.properties,v
retrieving revision 1.12
diff -u -w -b -r1.12 prefutilities.properties
--- prefutilities.properties 2001/05/17 02:02:51 1.12
+++ prefutilities.properties 2001/06/06 01:38:51
@@ -9,6 +9,9 @@
# theme into the %theme_name% segment
applyThemePrefix=Apply %theme_name%
uninstallThemePrefix=Uninstall %theme_name%
-
oldTheme=You have selected a theme which was designed for an earlier version of %brand% and is incompatible with your current %brand% version. Please check the %brand% Theme Park for an updated version of the theme. You can uninstall this theme by clicking \"Uninstall %theme_name%\" button.
+#Content Pack and Appearance panels insert the application name into the placeholder designated as %brand%
+langAlert=Please restart %brand% to use the new Languages and Web Content setting.
+contentAlert=Please restart %brand% to use the new Content Pack setting.
+languageAlert=Please restart %brand% to use the new preferred language setting.
Index: xpfe/global/resources/content/strres.js
===================================================================
RCS file: /cvsroot/mozilla/xpfe/global/resources/content/strres.js,v
retrieving revision 1.11
diff -u -w -b -r1.11 strres.js
--- strres.js 2001/05/12 03:55:46 1.11
+++ strres.js 2001/06/06 01:44:42
@@ -32,13 +32,14 @@
}
var node = event.target;
var langcode = node.getAttribute('value');
- //var old_lang = chromeRegistry.getSelectedLocale("navigator");
- //dump("\n-->old_lang=" + old_lang + "--");
chromeRegistry.selectLocale(langcode, true);
dump("\n-->set new lang, langcode=" + langcode + "--");
- var sbundle = srGetStrBundle("chrome://global/locale/brand.properties");
- var alertstr = sbundle.GetStringFromName("langAlert");
- alert(alertstr);
+
+ var prefUtilBundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
+ var brandBundle = srGetStrBundle("chrome://global/locale/brand.properties");
+ var alertText = prefUtilBundle.GetStringFromName("langAlert");
+ alertText = alertText.replace(/%brand%/g, brandBundle.GetStringFromName("brandShortName"));
+ alert(alertText);
}
catch(e) {
dump("\n--> strres.js: selectLocale() failed!\n");
Index: xpfe/global/resources/locale/en-US/brand.properties
===================================================================
RCS file: /cvsroot/mozilla/xpfe/global/resources/locale/en-US/brand.properties,v
retrieving revision 1.12
diff -u -w -b -r1.12 brand.properties
--- brand.properties 2001/02/27 11:31:52 1.12
+++ brand.properties 2001/06/06 01:38:52
@@ -1,3 +1,2 @@
brandShortName=Mozilla
vendorShortName=Mozilla
-langAlert=Please restart Mozilla to use the new Languages and Web Content setting.