From aa952bec80d7bc007dbeb5cef9ec3e98e1c5622b Mon Sep 17 00:00:00 2001 From: "chanial%noos.fr" Date: Sat, 15 Nov 2003 08:26:10 +0000 Subject: [PATCH] move the i18n part of browser.properties into the toolkit (intl.properties) Even if the platform dependent files intl.properties are identical for en-US, I think it's a good idea to keep them in seperate directories, to not mislead localizers. git-svn-id: svn://10.0.0.236/trunk@149346 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/profile/all.js | 36 ++++++++++--------- mozilla/browser/app/profile/firebird.js | 36 ++++++++++--------- .../browser/base/locale/browser.properties | 27 -------------- mozilla/toolkit/locale/intl.properties | 20 +++++++++++ mozilla/toolkit/locale/jar.mn | 4 +++ mozilla/toolkit/locale/mac/intl.properties | 5 +++ mozilla/toolkit/locale/unix/intl.properties | 5 +++ mozilla/toolkit/locale/win/intl.properties | 5 +++ 8 files changed, 79 insertions(+), 59 deletions(-) create mode 100644 mozilla/toolkit/locale/intl.properties create mode 100644 mozilla/toolkit/locale/mac/intl.properties create mode 100644 mozilla/toolkit/locale/unix/intl.properties create mode 100644 mozilla/toolkit/locale/win/intl.properties diff --git a/mozilla/browser/app/profile/all.js b/mozilla/browser/app/profile/all.js index 1ad48078b6c..63dc3d47bde 100644 --- a/mozilla/browser/app/profile/all.js +++ b/mozilla/browser/app/profile/all.js @@ -45,7 +45,7 @@ pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul pref("keyword.enabled", true); pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="); -pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties"); pref("general.useragent.vendor", "Firebird"); pref("general.useragent.vendorSub", "0.7+"); @@ -458,26 +458,30 @@ pref("network.enableIDN", false); // Turn on/off IDN (Internat pref("converter.html2txt.structs", true); // Output structured phrases (strong, em, code, sub, sup, b, i, u) pref("converter.html2txt.header_strategy", 1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention pref("imageblocker.enabled", true); -pref("intl.accept_languages", "chrome://navigator/locale/navigator.properties"); -pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); -pref("intl.collationOption", "chrome://navigator-platform/locale/navigator.properties"); -pref("intl.menuitems.alwaysappendacceskeys","chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.static", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more1", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more2", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more3", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more4", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more5", "chrome://navigator/locale/navigator.properties"); + +// l12n and i18n +pref("intl.accept_languages", "chrome://global/locale/intl.properties"); +pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); +// collationOption is only set on linux for japanese. see bug 18338 and 62015 +// we need to check if this pref is still useful. +pref("intl.collationOption", "chrome://global-platform/locale/intl.properties"); +pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more1", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties"); pref("intl.charsetmenu.browser.cache.size", 5); -pref("intl.charset.detector", "chrome://navigator/locale/navigator.properties"); -pref("intl.charset.default", "chrome://navigator-platform/locale/navigator.properties"); -pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties"); -pref("intl.locale.matchOS", false); +pref("intl.charset.detector", "chrome://global/locale/intl.properties"); +pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); +pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties"); +pref("intl.locale.matchOS", false); // fallback charset list for Unicode conversion (converting from Unicode) // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) // for ISO-8859-1 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252"); -pref("font.language.group", "chrome://navigator/locale/navigator.properties"); +pref("font.language.group", "chrome://global/locale/intl.properties"); +pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); // -- folders (Mac: these are binary aliases.) pref("security.directory", ""); diff --git a/mozilla/browser/app/profile/firebird.js b/mozilla/browser/app/profile/firebird.js index 1ad48078b6c..63dc3d47bde 100644 --- a/mozilla/browser/app/profile/firebird.js +++ b/mozilla/browser/app/profile/firebird.js @@ -45,7 +45,7 @@ pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul pref("keyword.enabled", true); pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="); -pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties"); pref("general.useragent.vendor", "Firebird"); pref("general.useragent.vendorSub", "0.7+"); @@ -458,26 +458,30 @@ pref("network.enableIDN", false); // Turn on/off IDN (Internat pref("converter.html2txt.structs", true); // Output structured phrases (strong, em, code, sub, sup, b, i, u) pref("converter.html2txt.header_strategy", 1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention pref("imageblocker.enabled", true); -pref("intl.accept_languages", "chrome://navigator/locale/navigator.properties"); -pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); -pref("intl.collationOption", "chrome://navigator-platform/locale/navigator.properties"); -pref("intl.menuitems.alwaysappendacceskeys","chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.static", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more1", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more2", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more3", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more4", "chrome://navigator/locale/navigator.properties"); -pref("intl.charsetmenu.browser.more5", "chrome://navigator/locale/navigator.properties"); + +// l12n and i18n +pref("intl.accept_languages", "chrome://global/locale/intl.properties"); +pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); +// collationOption is only set on linux for japanese. see bug 18338 and 62015 +// we need to check if this pref is still useful. +pref("intl.collationOption", "chrome://global-platform/locale/intl.properties"); +pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more1", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties"); pref("intl.charsetmenu.browser.cache.size", 5); -pref("intl.charset.detector", "chrome://navigator/locale/navigator.properties"); -pref("intl.charset.default", "chrome://navigator-platform/locale/navigator.properties"); -pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties"); -pref("intl.locale.matchOS", false); +pref("intl.charset.detector", "chrome://global/locale/intl.properties"); +pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); +pref("intl.content.langcode", "chrome://communicator-region/locale/region.properties"); +pref("intl.locale.matchOS", false); // fallback charset list for Unicode conversion (converting from Unicode) // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) // for ISO-8859-1 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252"); -pref("font.language.group", "chrome://navigator/locale/navigator.properties"); +pref("font.language.group", "chrome://global/locale/intl.properties"); +pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); // -- folders (Mac: these are binary aliases.) pref("security.directory", ""); diff --git a/mozilla/browser/base/locale/browser.properties b/mozilla/browser/base/locale/browser.properties index 2f5db79d2db..a185783c4d8 100644 --- a/mozilla/browser/base/locale/browser.properties +++ b/mozilla/browser/base/locale/browser.properties @@ -10,33 +10,6 @@ droponhomemsg=Do you want this document to be your new home page? jserror=An error has occurred on this page. Double click here for details. -# -# localizable preference value -# - -# all.js -# -# Localization Note: Cases of charset names must be preserved. If you're -# adding charsets to your localized version, please refer to -# intl/uconv/src/charsetalias.properties file for the list of canonical -# charset names and use canonical names exactly as listed there. -general.useragent.locale=en-US -font.language.group=x-western -intl.accept_languages=en-us, en -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 -intl.charsetmenu.browser.more2=ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian -intl.charsetmenu.browser.more3=GB2312, x-gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR -intl.charsetmenu.browser.more4=armscii-8, GEOSTD8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi -intl.charsetmenu.browser.more5=ISO-8859-6, windows-1256, IBM864, x-mac-arabic, x-mac-farsi, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862, x-mac-hebrew -intl.charset.default=ISO-8859-1 -intl.charset.detector= -intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII -# valid collation options are: or useCodePointOrder -intl.collationOption= -# valid intl.menuitems.appendedacceskeys are: true or false, (missing or empty preference equals false) -intl.menuitems.alwaysappendacceskeys= - linkTargetLabel=Link will open in: linkHREFLabel=Location: diff --git a/mozilla/toolkit/locale/intl.properties b/mozilla/toolkit/locale/intl.properties new file mode 100644 index 00000000000..0ace7828939 --- /dev/null +++ b/mozilla/toolkit/locale/intl.properties @@ -0,0 +1,20 @@ +# all.js +# +general.useragent.locale=en-US +font.language.group=x-western +intl.accept_languages=en-us, en +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 +intl.charsetmenu.browser.more2=iso-8859-4, iso-8859-13, windows-1257, ibm852, iso-8859-2, x-mac-ce, windows-1250, x-mac-croatian, ibm855, iso-8859-5, iso-ir-111, koi8-r, x-mac-cyrillic, windows-1251, ibm866, koi8-u, x-mac-ukrainian, iso-8859-16, x-mac-romanian +intl.charsetmenu.browser.more3=gb2312, x-gbk, gb18030, hz-gb-2312, iso-2022-cn, big5, big5-hkscs, x-euc-tw, euc-jp, iso-2022-jp, shift_jis, euc-kr, x-windows-949, x-johab, iso-2022-kr +intl.charsetmenu.browser.more4=armscii-8, geostd8, tis-620, iso-8859-11, windows-874, ibm857, iso-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, viscii, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi +intl.charsetmenu.browser.more5=iso-8859-6, windows-1256, ibm864, x-mac-arabic, x-mac-farsi, iso-8859-8-i, windows-1255, iso-8859-8, ibm862, x-mac-hebrew +intl.charset.default=ISO-8859-1 +intl.charset.detector= +intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII +# valid collation options are: or useCodePointOrder +intl.collationOption= +wallet.Server=http://www.mozilla.org/wallet/tables/ +wallet.Samples=http://www.mozilla.org/wallet/samples/ +# valid intl.menuitems.appendedacceskeys are: true or false, (missing or empty preference equals false) +intl.menuitems.alwaysappendaccesskeys= diff --git a/mozilla/toolkit/locale/jar.mn b/mozilla/toolkit/locale/jar.mn index 7d2db054433..3b50513c735 100644 --- a/mozilla/toolkit/locale/jar.mn +++ b/mozilla/toolkit/locale/jar.mn @@ -15,6 +15,7 @@ en-US.jar: + locale/en-US/global/finddialog.dtd + locale/en-US/global/finddialog.properties + locale/en-US/global/intl.css ++ locale/en-US/global/intl.properties + locale/en-US/global/keys.properties + locale/en-US/global/languageNames.properties + locale/en-US/global/regionNames.properties @@ -26,14 +27,17 @@ en-US.jar: en-win.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/intl.properties (win/intl.properties) + locale/en-US/global-platform/platformKeys.properties en-unix.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/intl.properties (unix/intl.properties) + locale/en-US/global-platform/platformKeys.properties en-mac.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/intl.properties (mac/intl.properties) + locale/en-US/global-platform/platformKeys.properties (platformKeys-mac.properties) US.jar: diff --git a/mozilla/toolkit/locale/mac/intl.properties b/mozilla/toolkit/locale/mac/intl.properties new file mode 100644 index 00000000000..e7613667b45 --- /dev/null +++ b/mozilla/toolkit/locale/mac/intl.properties @@ -0,0 +1,5 @@ +# moved from navigator/locale/navigator.properties +# valid collation options are: or useCodePointOrder +intl.collationOption= +intl.charset.default=ISO-8859-1 + diff --git a/mozilla/toolkit/locale/unix/intl.properties b/mozilla/toolkit/locale/unix/intl.properties new file mode 100644 index 00000000000..e7613667b45 --- /dev/null +++ b/mozilla/toolkit/locale/unix/intl.properties @@ -0,0 +1,5 @@ +# moved from navigator/locale/navigator.properties +# valid collation options are: or useCodePointOrder +intl.collationOption= +intl.charset.default=ISO-8859-1 + diff --git a/mozilla/toolkit/locale/win/intl.properties b/mozilla/toolkit/locale/win/intl.properties new file mode 100644 index 00000000000..e7613667b45 --- /dev/null +++ b/mozilla/toolkit/locale/win/intl.properties @@ -0,0 +1,5 @@ +# moved from navigator/locale/navigator.properties +# valid collation options are: or useCodePointOrder +intl.collationOption= +intl.charset.default=ISO-8859-1 +