From 2ddb76c50306984e2b5977327e8d547e6676760c Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Thu, 23 Sep 2004 23:24:05 +0000 Subject: [PATCH] Bug #214663 --> get rid of the region package in the installer because we don't need it anymore. There is no longer a US region pack getting packaged into the language pack (en-US-mail.jar). This makes life easier for the localization folks. --- mail/config/en-US-jar.mn | 4 ++-- mail/config/installed-chrome.txt | 2 +- mail/installer/windows/config.it | 25 +++++-------------------- mail/installer/windows/installer.cfg | 2 +- mail/installer/windows/langenus.jst | 2 +- mail/installer/windows/regus.jst | 0 6 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 mail/installer/windows/regus.jst diff --git a/mail/config/en-US-jar.mn b/mail/config/en-US-jar.mn index c5869dfc657..65ffe3d1e15 100644 --- a/mail/config/en-US-jar.mn +++ b/mail/config/en-US-jar.mn @@ -91,8 +91,8 @@ locale/en-US/editor/EdConvertToTable.dtd, en-US/locale/en-US/edi ################################################################################################# # US ################################################################################################# -locale/US/messenger-region, US/locale/US/messenger-region -locale/US/global-region, US/locale/US/global-region +locale/en-US/messenger-region, US/locale/US/messenger-region +locale/global-region, en-US/locale/global-region ################################################################################################# # crypto diff --git a/mail/config/installed-chrome.txt b/mail/config/installed-chrome.txt index ab01d34ddda..0d3bf04f0a8 100644 --- a/mail/config/installed-chrome.txt +++ b/mail/config/installed-chrome.txt @@ -40,7 +40,7 @@ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-m locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-views/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-smime/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-mapi/ -locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/US/messenger-region/ +locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-region/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/necko/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/editor/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/mozldap/ diff --git a/mail/installer/windows/config.it b/mail/installer/windows/config.it index d44e4bd4a0c..6aad6b55933 100644 --- a/mail/installer/windows/config.it +++ b/mail/installer/windows/config.it @@ -234,11 +234,10 @@ C1=Component Mail C2=Component Uninstaller C3=Component US English Profile Defaults C4=Component En US lang pack -C5=Component US region pack -C6=Component RSS +C5=Component RSS ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. -C7=Component QFA +C6=Component QFA [Setup Type1] ;*** LOCALIZE ME BABY *** @@ -254,13 +253,12 @@ C1=Component Mail C2=Component Uninstaller C3=Component US English Profile Defaults C4=Component En US lang pack -C5=Component US region pack -C6=Component Offline -C7=Component RSS +C5=Component Offline +C6=Component RSS ;C7=Component ADT ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. -C8=Component QFA +C7=Component QFA [Dialog Select Components] Show Dialog=TRUE @@ -693,19 +691,6 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE Force Upgrade File0=[SETUP PATH]\chrome\en-US.jar FileCount=$FileCount$ -[Component US region pack] -;*** LOCALIZE ME BABY *** -Description Short=US Region Pack -;*** LOCALIZE ME BABY *** -Description Long=Regional content for US users -Archive=regus.xpi -$InstallSize$:regus -$InstallSizeSystem$ -$InstallSizeArchive$:regus.xpi -Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE -Force Upgrade File0=[SETUP PATH]\chrome\US.jar -FileCount=$FileCount$ - [Component QFA] Description Short=Quality Feedback Agent ;*** LOCALIZE ME BABY *** diff --git a/mail/installer/windows/installer.cfg b/mail/installer/windows/installer.cfg index 1f2d89b22d1..1becdeeae54 100644 --- a/mail/installer/windows/installer.cfg +++ b/mail/installer/windows/installer.cfg @@ -11,6 +11,6 @@ FileMainEXE = thunderbird.exe FileUninstall = UninstallThunderbird.exe FileUninstallZIP = UninstallThunderbird.zip FileInstallerNETRoot = ThunderbirdNetSetup -ComponentList = xpcom,mail,talkback,deflenus,langenus,regus,offline,newsblog +ComponentList = xpcom,mail,talkback,deflenus,langenus,offline,newsblog LicenseFile = mail/LICENSE.txt 7ZipSFXModule = other-licenses/7zstub/thunderbird/7zSD.sfx diff --git a/mail/installer/windows/langenus.jst b/mail/installer/windows/langenus.jst index de59bf66880..ebdfe90c9e7 100644 --- a/mail/installer/windows/langenus.jst +++ b/mail/installer/windows/langenus.jst @@ -75,7 +75,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "messenger/"); registerChrome(chromeType, cf, localeName + "editor/"); registerChrome(chromeType, cf, localeName + "messenger-mapi/"); - + registerChrome(chromeType, cf, localeName + "messenger-region/"); registerChrome(chromeType, cf, localeName + "communicator/"); registerChrome(chromeType, pf, localeName + "communicator-platform/"); diff --git a/mail/installer/windows/regus.jst b/mail/installer/windows/regus.jst deleted file mode 100644 index e69de29bb2d..00000000000