From bf75e393f770895d9cb614a66e160f16eec53fec Mon Sep 17 00:00:00 2001 From: "tao%netscape.com" Date: Tue, 6 Mar 2001 02:34:34 +0000 Subject: [PATCH] 1. 61626:"Need to make langxxxx.xpi platform neutral" 2. 70622: fix the "update.html" is also included. 3. 69934: make regus.jst & langenus.jst more localization friendly. r=ssu,sr=deveditz. --- profile/src/nsProfile.cpp | 2 +- xpfe/browser/Makefile.in | 2 ++ .../content/unix/contents-platform.rdf | 16 ++++++++++ xpfe/browser/resources/content/unix/jar.mn | 1 + .../unix/platformNavigationBindings.xul | 2 +- .../locale/en-US/unix/contents-platform.rdf | 22 ++++++++++++++ .../resources/locale/en-US/unix/jar.mn | 5 ++-- xpfe/communicator/Makefile.in | 2 ++ xpfe/communicator/jar.mn | 1 + xpfe/communicator/makefile.win | 2 ++ .../resources/content/contents-platform.rdf | 16 ++++++++++ .../content/mac/platformGlobalOverlay.xul | 2 +- .../content/os2/platformGlobalOverlay.xul | 2 +- .../content/unix/platformGlobalOverlay.xul | 2 +- .../content/win/platformGlobalOverlay.xul | 2 +- .../resources/content/pref-mousewheel.xul | 2 +- .../resources/content/pref-winhooks.xul | 2 +- .../content/unix/platformPrefOverlay.xul | 2 +- .../content/win/platformPrefOverlay.xul | 2 +- .../locale/en-US/unix/contents-platform.rdf | 21 ++++++++++++++ .../resources/locale/en-US/unix/jar.mn | 5 ++-- .../locale/en-US/win/contents-platform.rdf | 21 ++++++++++++++ .../resources/locale/en-US/win/jar.mn | 5 ++-- xpfe/global/Makefile.in | 2 ++ xpfe/global/jar.mn | 1 + xpfe/global/makefile.win | 4 ++- .../resources/content/contents-platform.rdf | 16 ++++++++++ .../content/mac/platformGlobalOverlay.xul | 2 +- .../content/os2/platformDialogOverlay.xul | 2 +- .../content/os2/platformGlobalOverlay.xul | 2 +- .../content/unix/platformDialogOverlay.xul | 2 +- .../content/unix/platformGlobalOverlay.xul | 2 +- .../resources/content/unix/printdialog.xul | 2 +- .../content/win/platformDialogOverlay.xul | 2 +- .../content/win/platformGlobalOverlay.xul | 2 +- .../locale/en-US/mac/contents-platform.rdf | 19 ++++++++++++ xpfe/global/resources/locale/en-US/mac/jar.mn | 7 +++-- .../locale/en-US/os2/contents-platform.rdf | 19 ++++++++++++ xpfe/global/resources/locale/en-US/os2/jar.mn | 7 +++-- .../locale/en-US/unix/contents-platform.rdf | 19 ++++++++++++ .../global/resources/locale/en-US/unix/jar.mn | 9 +++--- .../locale/en-US/win/contents-platform.rdf | 19 ++++++++++++ xpfe/global/resources/locale/en-US/win/jar.mn | 7 +++-- xpinstall/packager/mac/browser.jst | 3 ++ xpinstall/packager/mac/langenus.jst | 29 ++++++++++++------- xpinstall/packager/mac/regus.jst | 16 +++++----- xpinstall/packager/packages-mac | 1 + xpinstall/packager/packages-unix | 1 + xpinstall/packager/packages-win | 1 + xpinstall/packager/unix/browser.jst | 4 +++ xpinstall/packager/unix/config.it | 4 +-- xpinstall/packager/unix/langenus.jst | 29 ++++++++++++------- xpinstall/packager/unix/regus.jst | 16 +++++----- xpinstall/packager/windows/browser.jst | 3 ++ xpinstall/packager/windows/config.it | 4 +-- xpinstall/packager/windows/langenus.jst | 29 ++++++++++++------- xpinstall/packager/windows/regus.jst | 17 ++++++----- .../Installer Modules/config.ini_tmpl | 4 +-- xpinstall/wizard/mac/macbuild/config.ini_tmpl | 4 +-- 59 files changed, 349 insertions(+), 100 deletions(-) create mode 100644 xpfe/browser/resources/content/unix/contents-platform.rdf create mode 100644 xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf create mode 100644 xpfe/communicator/resources/content/contents-platform.rdf create mode 100644 xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf create mode 100644 xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf create mode 100644 xpfe/global/resources/content/contents-platform.rdf create mode 100644 xpfe/global/resources/locale/en-US/mac/contents-platform.rdf create mode 100644 xpfe/global/resources/locale/en-US/os2/contents-platform.rdf create mode 100644 xpfe/global/resources/locale/en-US/unix/contents-platform.rdf create mode 100644 xpfe/global/resources/locale/en-US/win/contents-platform.rdf diff --git a/profile/src/nsProfile.cpp b/profile/src/nsProfile.cpp index cc8543ba606..e734600f81c 100644 --- a/profile/src/nsProfile.cpp +++ b/profile/src/nsProfile.cpp @@ -1707,7 +1707,7 @@ nsProfile::DefineLocaleDefaultsDir() if (NS_SUCCEEDED(rv)) { nsXPIDLString localeName; - rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator"), getter_Copies(localeName)); + rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("global-region"), getter_Copies(localeName)); if (NS_SUCCEEDED(rv)) rv = localeDefaults->AppendUnicode(localeName); } diff --git a/xpfe/browser/Makefile.in b/xpfe/browser/Makefile.in index c4e8dd699b2..edfa533d652 100644 --- a/xpfe/browser/Makefile.in +++ b/xpfe/browser/Makefile.in @@ -33,5 +33,7 @@ include $(topsrcdir)/config/rules.mk chrome:: @$(REGCHROME) content navigator comm.jar @$(REGCHROME) content navigator-region comm.jar + @$(REGCHROME) content navigator-platform comm.jar @$(REGCHROME) locale en-US/navigator en-US.jar @$(REGCHROME) locale US/navigator-region US.jar + @$(REGCHROME) locale en-US/navigator-platform en-unix.jar diff --git a/xpfe/browser/resources/content/unix/contents-platform.rdf b/xpfe/browser/resources/content/unix/contents-platform.rdf new file mode 100644 index 00000000000..89464a20420 --- /dev/null +++ b/xpfe/browser/resources/content/unix/contents-platform.rdf @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/xpfe/browser/resources/content/unix/jar.mn b/xpfe/browser/resources/content/unix/jar.mn index d92f44ff05d..76330940a48 100644 --- a/xpfe/browser/resources/content/unix/jar.mn +++ b/xpfe/browser/resources/content/unix/jar.mn @@ -1,2 +1,3 @@ comm.jar: + content/navigator-platform/contents.rdf (contents-platform.rdf) content/navigator/platformNavigationBindings.xul diff --git a/xpfe/browser/resources/content/unix/platformNavigationBindings.xul b/xpfe/browser/resources/content/unix/platformNavigationBindings.xul index d5bb7c60192..449b7ab0775 100644 --- a/xpfe/browser/resources/content/unix/platformNavigationBindings.xul +++ b/xpfe/browser/resources/content/unix/platformNavigationBindings.xul @@ -1,6 +1,6 @@ - + diff --git a/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf b/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf new file mode 100644 index 00000000000..48373285d18 --- /dev/null +++ b/xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/xpfe/browser/resources/locale/en-US/unix/jar.mn b/xpfe/browser/resources/locale/en-US/unix/jar.mn index 91564b81f48..6ac37c26dba 100644 --- a/xpfe/browser/resources/locale/en-US/unix/jar.mn +++ b/xpfe/browser/resources/locale/en-US/unix/jar.mn @@ -1,2 +1,3 @@ -en-US.jar: - locale/en-US/navigator/platformNavigationBindings.dtd +en-unix.jar: + locale/en-US/navigator-platform/contents.rdf (contents-platform.rdf) + locale/en-US/navigator-platform/platformNavigationBindings.dtd diff --git a/xpfe/communicator/Makefile.in b/xpfe/communicator/Makefile.in index ada93d60a1c..ead65ad43ca 100644 --- a/xpfe/communicator/Makefile.in +++ b/xpfe/communicator/Makefile.in @@ -33,5 +33,7 @@ include $(topsrcdir)/config/rules.mk chrome:: @$(REGCHROME) content communicator comm.jar @$(REGCHROME) content communicator-region comm.jar + @$(REGCHROME) content communicator-platform comm.jar @$(REGCHROME) locale en-US/communicator en-US.jar @$(REGCHROME) locale US/communicator-region US.jar + @$(REGCHROME) locale en-US/communicator-platform en-unix.jar diff --git a/xpfe/communicator/jar.mn b/xpfe/communicator/jar.mn index 0259d7eef06..0a2e0cbf4b7 100644 --- a/xpfe/communicator/jar.mn +++ b/xpfe/communicator/jar.mn @@ -1,4 +1,5 @@ comm.jar: + content/communicator-platform/contents.rdf (resources/content/contents-platform.rdf) content/communicator-region/contents.rdf (resources/content/contents-region.rdf) content/communicator/contents.rdf (resources/content/contents.rdf) content/communicator/communicatorOverlay.xul (resources/content/communicatorOverlay.xul) diff --git a/xpfe/communicator/makefile.win b/xpfe/communicator/makefile.win index 7315b10f91d..59f871b5b37 100644 --- a/xpfe/communicator/makefile.win +++ b/xpfe/communicator/makefile.win @@ -28,5 +28,7 @@ include <$(DEPTH)\config\rules.mak> chrome:: $(REGCHROME) content communicator comm.jar $(REGCHROME) content communicator-region comm.jar + $(REGCHROME) content communicator-platform comm.jar $(REGCHROME) locale en-US/communicator en-US.jar $(REGCHROME) locale US/communicator-region US.jar + $(REGCHROME) locale en-US/communicator-platform en-win.jar diff --git a/xpfe/communicator/resources/content/contents-platform.rdf b/xpfe/communicator/resources/content/contents-platform.rdf new file mode 100644 index 00000000000..3e3cb1b2095 --- /dev/null +++ b/xpfe/communicator/resources/content/contents-platform.rdf @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/xpfe/communicator/resources/content/mac/platformGlobalOverlay.xul b/xpfe/communicator/resources/content/mac/platformGlobalOverlay.xul index 83d44d3229c..b70edf48238 100644 --- a/xpfe/communicator/resources/content/mac/platformGlobalOverlay.xul +++ b/xpfe/communicator/resources/content/mac/platformGlobalOverlay.xul @@ -1,7 +1,7 @@ - + - + - + - + + %platformDTD; %prefMousewheelDTD; diff --git a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul index f2e424763cf..cdbb5c0c7cc 100644 --- a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul +++ b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul @@ -29,7 +29,7 @@ %brandDTD; - + %platformDTD; %prefWinhooksDTD; diff --git a/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul b/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul index 11d17dd80ed..0b12b19e464 100644 --- a/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul +++ b/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul @@ -23,7 +23,7 @@ Ben Goodger --> - + diff --git a/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul b/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul index f03232687fe..edc6efe5841 100644 --- a/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul +++ b/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul @@ -23,7 +23,7 @@ Ben Goodger --> - + diff --git a/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf b/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf new file mode 100644 index 00000000000..2d6de00f163 --- /dev/null +++ b/xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn b/xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn index 14d5e574222..088267af946 100644 --- a/xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn +++ b/xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn @@ -1,2 +1,3 @@ -en-US.jar: - locale/en-US/communicator/pref/platformPrefOverlay.dtd +en-unix.jar: + locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf) + locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd diff --git a/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf b/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf new file mode 100644 index 00000000000..2d6de00f163 --- /dev/null +++ b/xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn b/xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn index 14d5e574222..e7ae9284b47 100644 --- a/xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn +++ b/xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn @@ -1,2 +1,3 @@ -en-US.jar: - locale/en-US/communicator/pref/platformPrefOverlay.dtd +en-win.jar: + locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf) + locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd diff --git a/xpfe/global/Makefile.in b/xpfe/global/Makefile.in index cdec1349dfd..3abbbc0c4ab 100644 --- a/xpfe/global/Makefile.in +++ b/xpfe/global/Makefile.in @@ -41,6 +41,8 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number chrome:: @$(REGCHROME) content global toolkit.jar @$(REGCHROME) content global-region toolkit.jar + @$(REGCHROME) content global-platform toolkit.jar @$(REGCHROME) locale en-US/global en-US.jar @$(REGCHROME) locale US/global-region US.jar + @$(REGCHROME) locale en-US/global-platform en-unix.jar diff --git a/xpfe/global/jar.mn b/xpfe/global/jar.mn index c440fc036ea..bfad07e77e1 100644 --- a/xpfe/global/jar.mn +++ b/xpfe/global/jar.mn @@ -1,5 +1,6 @@ toolkit.jar: content/global/contents.rdf (resources/content/contents.rdf) + content/global-platform/contents.rdf (resources/content/contents-platform.rdf) content/global-region/contents.rdf (resources/content/contents-region.rdf) content/global/hiddenWindow.xul (resources/content/hiddenWindow.xul) content/global/globalOverlay.xul (resources/content/globalOverlay.xul) diff --git a/xpfe/global/makefile.win b/xpfe/global/makefile.win index 7bded1c49a0..5f4f9751da1 100644 --- a/xpfe/global/makefile.win +++ b/xpfe/global/makefile.win @@ -30,9 +30,11 @@ include <$(DEPTH)\config\rules.mak> chrome:: $(REGCHROME) content global toolkit.jar - $(REGCHROME) content global-region toolkit.jar + $(REGCHROME) content global-region toolkit.jar + $(REGCHROME) content global-platform toolkit.jar $(REGCHROME) locale en-US/global en-US.jar $(REGCHROME) locale US/global-region US.jar + $(REGCHROME) locale en-US/global-platform en-win.jar build.dtd: build.dtd.in $(DEPTH)\config\build_number @rm -f $@ diff --git a/xpfe/global/resources/content/contents-platform.rdf b/xpfe/global/resources/content/contents-platform.rdf new file mode 100644 index 00000000000..6d688ab5569 --- /dev/null +++ b/xpfe/global/resources/content/contents-platform.rdf @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/xpfe/global/resources/content/mac/platformGlobalOverlay.xul b/xpfe/global/resources/content/mac/platformGlobalOverlay.xul index 83d44d3229c..b70edf48238 100644 --- a/xpfe/global/resources/content/mac/platformGlobalOverlay.xul +++ b/xpfe/global/resources/content/mac/platformGlobalOverlay.xul @@ -1,7 +1,7 @@ - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + diff --git a/xpfe/global/resources/locale/en-US/mac/jar.mn b/xpfe/global/resources/locale/en-US/mac/jar.mn index c116e69f08f..8deea630d3c 100644 --- a/xpfe/global/resources/locale/en-US/mac/jar.mn +++ b/xpfe/global/resources/locale/en-US/mac/jar.mn @@ -1,3 +1,4 @@ -en-US.jar: - locale/en-US/global/platformGlobalOverlay.dtd - locale/en-US/global/platformDialogOverlay.dtd +en-mac.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/platformGlobalOverlay.dtd + locale/en-US/global-platform/platformDialogOverlay.dtd diff --git a/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf b/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf new file mode 100644 index 00000000000..1b25859a1d8 --- /dev/null +++ b/xpfe/global/resources/locale/en-US/os2/contents-platform.rdf @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/xpfe/global/resources/locale/en-US/os2/jar.mn b/xpfe/global/resources/locale/en-US/os2/jar.mn index c116e69f08f..ce23072df5a 100644 --- a/xpfe/global/resources/locale/en-US/os2/jar.mn +++ b/xpfe/global/resources/locale/en-US/os2/jar.mn @@ -1,3 +1,4 @@ -en-US.jar: - locale/en-US/global/platformGlobalOverlay.dtd - locale/en-US/global/platformDialogOverlay.dtd +en-os2.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/platformGlobalOverlay.dtd + locale/en-US/global-platform/platformDialogOverlay.dtd diff --git a/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf b/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf new file mode 100644 index 00000000000..6cfd2621036 --- /dev/null +++ b/xpfe/global/resources/locale/en-US/unix/contents-platform.rdf @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/xpfe/global/resources/locale/en-US/unix/jar.mn b/xpfe/global/resources/locale/en-US/unix/jar.mn index ee879d2f036..77007d01bd4 100644 --- a/xpfe/global/resources/locale/en-US/unix/jar.mn +++ b/xpfe/global/resources/locale/en-US/unix/jar.mn @@ -1,4 +1,5 @@ -en-US.jar: - locale/en-US/global/platformGlobalOverlay.dtd - locale/en-US/global/platformDialogOverlay.dtd - locale/en-US/global/printdialog.dtd +en-unix.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/platformGlobalOverlay.dtd + locale/en-US/global-platform/platformDialogOverlay.dtd + locale/en-US/global-platform/printdialog.dtd diff --git a/xpfe/global/resources/locale/en-US/win/contents-platform.rdf b/xpfe/global/resources/locale/en-US/win/contents-platform.rdf new file mode 100644 index 00000000000..1b25859a1d8 --- /dev/null +++ b/xpfe/global/resources/locale/en-US/win/contents-platform.rdf @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/xpfe/global/resources/locale/en-US/win/jar.mn b/xpfe/global/resources/locale/en-US/win/jar.mn index c116e69f08f..082af7fea20 100644 --- a/xpfe/global/resources/locale/en-US/win/jar.mn +++ b/xpfe/global/resources/locale/en-US/win/jar.mn @@ -1,3 +1,4 @@ -en-US.jar: - locale/en-US/global/platformGlobalOverlay.dtd - locale/en-US/global/platformDialogOverlay.dtd +en-win.jar: + locale/en-US/global-platform/contents.rdf (contents-platform.rdf) + locale/en-US/global-platform/platformGlobalOverlay.dtd + locale/en-US/global-platform/platformDialogOverlay.dtd diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst index daa32689402..9953d3b3db5 100644 --- a/xpinstall/packager/mac/browser.jst +++ b/xpinstall/packager/mac/browser.jst @@ -18,6 +18,9 @@ if (verifyDiskSpace(fProgram, srDest)) logComment("addDirectory() returned: " + err); var cf = getFolder("Chrome"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/"); diff --git a/xpinstall/packager/mac/langenus.jst b/xpinstall/packager/mac/langenus.jst index 16ccee6d021..5d375e7ab7d 100644 --- a/xpinstall/packager/mac/langenus.jst +++ b/xpinstall/packager/mac/langenus.jst @@ -4,10 +4,14 @@ var err; var fProgram; // --- LOCALIZATION NOTE: translate only these --- -var prettyName = "English-US Language Pack"; -var regName = "locales/mozilla/en-US"; -var chromeName = "en-US.jar"; +var prettyName = "English (US) Language Pack"; +var langcode = "en"; +var chromeNode = langcode + "-US"; // --- END LOCALIZABLE RESOURCES --- +var regName = "locales/mozilla/" + chromeNode; +var chromeName = chromeNode + ".jar"; +var platformName = langcode + "-mac.jar"; +var localeName = "locale/" + chromeNode + "/"; err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); @@ -26,14 +30,17 @@ if (verifyDiskSpace(fProgram, srDest)) logComment("addDirectory() returned: " + err); var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/necko/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/cookie/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/wallet/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "necko/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "cookie/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "wallet/"); + + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "global-platform/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "communicator-platform/"); if(err == SUCCESS) { diff --git a/xpinstall/packager/mac/regus.jst b/xpinstall/packager/mac/regus.jst index a5d2aef1d4d..8e8b349e558 100644 --- a/xpinstall/packager/mac/regus.jst +++ b/xpinstall/packager/mac/regus.jst @@ -5,9 +5,11 @@ var fProgram; // --- LOCALIZATION NOTE: translate only these --- var prettyName = "US Region Pack"; -var regName = "locales/mozilla/US"; -var chromeName = "US.jar"; +var chromeNode = "US"; // --- END LOCALIZABLE RESOURCES --- +var regName = "locales/mozilla/" + chromeNode; +var chromeName = chromeNode + ".jar"; +var localeName = "locale/" + chromeNode + "/"; err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); @@ -26,11 +28,11 @@ if (verifyDiskSpace(fProgram, srDest)) logComment("addDirectory() returned: " + err); var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator-region/"); if(err == SUCCESS) { diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac index d2db1d3a7df..312ac874c37 100644 --- a/xpinstall/packager/packages-mac +++ b/xpinstall/packager/packages-mac @@ -12,6 +12,7 @@ ; ; en-US viewer:chrome:en-US.jar +viewer:chrome:en-mac.jar [regus] ; diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index 0a4ebdb0df9..cd17cd23df7 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -12,6 +12,7 @@ ; ; en-US bin/chrome/en-US.jar +bin/chrome/en-unix.jar [regus] ; diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win index b89d0b3d148..7aab69c180a 100644 --- a/xpinstall/packager/packages-win +++ b/xpinstall/packager/packages-win @@ -12,6 +12,7 @@ ; ; en-US bin\chrome\en-US\* +bin\chrome\en-win\* [regus] ; diff --git a/xpinstall/packager/unix/browser.jst b/xpinstall/packager/unix/browser.jst index bc6834630f2..420dabac924 100644 --- a/xpinstall/packager/unix/browser.jst +++ b/xpinstall/packager/unix/browser.jst @@ -23,6 +23,10 @@ if (verifyDiskSpace(communicatorFolder, srDest)) logComment("dirCreate() returned: " + ignoreErr); var cf = getFolder("Chrome"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/"); diff --git a/xpinstall/packager/unix/config.it b/xpinstall/packager/unix/config.it index 50b56995964..d0e6c1dde2b 100644 --- a/xpinstall/packager/unix/config.it +++ b/xpinstall/packager/unix/config.it @@ -160,9 +160,9 @@ Attributes=SELECTED|INVISIBLE URL0=$URLPath$ [Component7] -Description Short=English US Language Pack +Description Short=English (US) Language Pack ; *** LOCALIZE ME BABY *** -Description Long=English US Language Pack +Description Long=English (US) Language Pack Archive=langenus.xpi $InstallSize$:langenus Attributes=SELECTED|INVISIBLE diff --git a/xpinstall/packager/unix/langenus.jst b/xpinstall/packager/unix/langenus.jst index 093a88ba0d8..f0606224e4b 100644 --- a/xpinstall/packager/unix/langenus.jst +++ b/xpinstall/packager/unix/langenus.jst @@ -3,10 +3,14 @@ var err; var fProgram; // --- LOCALIZATION NOTE: translate only these --- -var prettyName = "English-US Language Pack"; -var regName = "locales/mozilla/en-US"; -var chromeName = "en-US.jar"; +var prettyName = "English (US) Language Pack"; +var langcode = "en"; +var chromeNode = langcode + "-US"; // --- END LOCALIZABLE RESOURCES --- +var regName = "locales/mozilla/" + chromeNode; +var chromeName = chromeNode + ".jar"; +var platformName = langcode + "-unix.jar"; +var localeName = "locale/" + chromeNode + "/"; err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); @@ -26,14 +30,17 @@ if (verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/necko/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/cookie/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/wallet/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "necko/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "cookie/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "wallet/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "global-platform/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "communicator-platform/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "navigator-platform/"); if (err == SUCCESS) { diff --git a/xpinstall/packager/unix/regus.jst b/xpinstall/packager/unix/regus.jst index f5a9a48d041..f6a26a786ca 100644 --- a/xpinstall/packager/unix/regus.jst +++ b/xpinstall/packager/unix/regus.jst @@ -4,9 +4,11 @@ var fProgram; // --- LOCALIZATION NOTE: translate only these --- var prettyName = "US Regional Pack"; -var regName = "locales/mozilla/US"; -var chromeName = "US.jar"; +var chromeNode = "US"; // --- END LOCALIZABLE RESOURCES --- +var regName = "locales/mozilla/" + chromeNode; +var chromeName = chromeNode + ".jar"; +var localeName = "locale/" + chromeNode + "/"; err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); @@ -26,11 +28,11 @@ if (verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator-region/"); if (err == SUCCESS) { diff --git a/xpinstall/packager/windows/browser.jst b/xpinstall/packager/windows/browser.jst index ab23615a21d..8348893cd5f 100644 --- a/xpinstall/packager/windows/browser.jst +++ b/xpinstall/packager/windows/browser.jst @@ -238,6 +238,9 @@ if(verifyDiskSpace(fProgram, srDest)) resetError(); // register chrome + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-platform/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-region/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/cookie/"); diff --git a/xpinstall/packager/windows/config.it b/xpinstall/packager/windows/config.it index 46876d1dccd..10a74f7b1c6 100644 --- a/xpinstall/packager/windows/config.it +++ b/xpinstall/packager/windows/config.it @@ -435,9 +435,9 @@ Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html [Component En US lang pack] ;*** LOCALIZE ME BABY *** -Description Short=English-US language pack +Description Short=English (US) language pack ;*** LOCALIZE ME BABY *** -Description Long=English-US language pack +Description Long=English (US)language pack Archive=langenus.xpi $InstallSize$:langenus $InstallSizeSystem$ diff --git a/xpinstall/packager/windows/langenus.jst b/xpinstall/packager/windows/langenus.jst index 671a5660765..a517a432388 100644 --- a/xpinstall/packager/windows/langenus.jst +++ b/xpinstall/packager/windows/langenus.jst @@ -4,10 +4,14 @@ var err; var fProgram; // ----LOCALIZATION NOTE: translate only these ------ -var prettyName = "English-US Language Pack"; -var regName = "locales/mozilla/en-US"; -var chromeName = "en-US.jar"; +var prettyName = "English (US) Language Pack"; +var langcode = "en"; +var chromeNode = langcode + "-US"; // --- END CHANGABLE STUFF --- +var regName = "locales/mozilla/" + chromeNode; +var chromeName = chromeNode + ".jar"; +var platformName = langcode + "-win.jar"; +var localeName = "locale/" + chromeNode + "/"; srDest = $SpaceRequired$:bin; err = initInstall(prettyName, regName, "$Version$"); @@ -29,15 +33,18 @@ if(verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/necko/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/cookie/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/wallet/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "necko/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "cookie/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "wallet/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "global-platform/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, platformName), localeName + "communicator-platform/"); + // check return value if(err == SUCCESS) { diff --git a/xpinstall/packager/windows/regus.jst b/xpinstall/packager/windows/regus.jst index 9342fc6e847..b69e2df4643 100644 --- a/xpinstall/packager/windows/regus.jst +++ b/xpinstall/packager/windows/regus.jst @@ -5,10 +5,13 @@ var fProgram; // ----LOCALIZATION NOTE: translate only these ------ var prettyName = "US Region Pack"; -var regName = "locales/mozilla/US"; -var chromeName = "US.jar"; +var chromeNode = "US"; // --- END CHANGABLE STUFF --- +var regName = "locales/mozilla/" + chromeNode; +var chromeName = chromeNode + ".jar"; +var localeName = "locale/" + chromeNode + "/"; + srDest = $SpaceRequired$:bin; err = initInstall(prettyName, regName, "$Version$"); logComment("initInstall: " + err); @@ -29,11 +32,11 @@ if(verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "global-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "communicator-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "editor-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "messenger-region/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), localeName + "navigator-region/"); // check return value if(err == SUCCESS) diff --git a/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl b/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl index 6ef0fb14ae6..b1329ebc5df 100644 --- a/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl +++ b/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl @@ -88,9 +88,9 @@ Install Size=<#deflenus_size> Attributes=SELECTED|INVISIBLE [Component5] -Description Short=English US Language Pack +Description Short=English (US) Language Pack ; *** LOCALIZE ME BABY *** -Description Long=English US Language Pack +Description Long=English (US) Language Pack Archive=langenus.xpi Install Size=<#langenus_size> Attributes=SELECTED|INVISIBLE diff --git a/xpinstall/wizard/mac/macbuild/config.ini_tmpl b/xpinstall/wizard/mac/macbuild/config.ini_tmpl index 6ef0fb14ae6..b1329ebc5df 100644 --- a/xpinstall/wizard/mac/macbuild/config.ini_tmpl +++ b/xpinstall/wizard/mac/macbuild/config.ini_tmpl @@ -88,9 +88,9 @@ Install Size=<#deflenus_size> Attributes=SELECTED|INVISIBLE [Component5] -Description Short=English US Language Pack +Description Short=English (US) Language Pack ; *** LOCALIZE ME BABY *** -Description Long=English US Language Pack +Description Long=English (US) Language Pack Archive=langenus.xpi Install Size=<#langenus_size> Attributes=SELECTED|INVISIBLE