From 4d7b010aa0dbfbcfba5c5ce05285d092868046c8 Mon Sep 17 00:00:00 2001 From: "steffen.wilberg%web.de" Date: Tue, 21 Dec 2004 17:51:41 +0000 Subject: [PATCH] Bug 275000 (some inputs are missing default values resulting in small-sized buttons with no text). Register chrome://communicator/locale/ again for the moment. Also replace en-US by @AB-CD@. r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@166923 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/installer/unix/ab-CD.jst | 26 +++++++++++---------- mozilla/browser/installer/windows/ab-CD.jst | 26 +++++++++++---------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/mozilla/browser/installer/unix/ab-CD.jst b/mozilla/browser/installer/unix/ab-CD.jst index 6aa11520655..db763a733ee 100644 --- a/mozilla/browser/installer/unix/ab-CD.jst +++ b/mozilla/browser/installer/unix/ab-CD.jst @@ -73,30 +73,32 @@ if (verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder(fProgram, "chrome/"+chromeName); - registerChrome(chromeType, cf, "locale/en-US/global/"); - registerChrome(chromeType, cf, "locale/en-US/global-platform/"); - registerChrome(chromeType, cf, "locale/en-US/global-region/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/global/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/global-platform/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/global-region/"); registerChrome(chromeType, cf, "locale/browser/"); registerChrome(chromeType, cf, "locale/browser-region/"); - registerChrome(chromeType, cf, "locale/en-US/passwordmgr/"); - registerChrome(chromeType, cf, "locale/en-US/mozapps/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/"); - registerChrome(chromeType, cf, "locale/en-US/necko/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/necko/"); #ifdef EXTENSION_PREF - registerChrome(chromeType, cf, "locale/en-US/autoconfig/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/autoconfig/"); #endif - registerChrome(chromeType, cf, "locale/en-US/cookie/"); - registerChrome(chromeType, cf, "locale/en-US/pipnss/"); - registerChrome(chromeType, cf, "locale/en-US/pippki/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/cookie/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/pipnss/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/pippki/"); #ifdef LOCALE_HAS_HELP - registerChrome(chromeType, cf, "locale/en-US/help/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/help/"); #endif #ifdef LOCALE_HAS_DOMI - registerChrome(chromeType, cf, "locale/en-US/inspector/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/inspector/"); #endif + registerChrome(chromeType, cf, "locale/@AB_CD@/communicator/"); + err = performInstall(); logComment("performInstall() returned: " + err); } diff --git a/mozilla/browser/installer/windows/ab-CD.jst b/mozilla/browser/installer/windows/ab-CD.jst index 8a26cbad781..2f98d5b6126 100644 --- a/mozilla/browser/installer/windows/ab-CD.jst +++ b/mozilla/browser/installer/windows/ab-CD.jst @@ -74,30 +74,32 @@ if(verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder(fProgram, "chrome/"+chromeName); - registerChrome(chromeType, cf, "locale/en-US/global/"); - registerChrome(chromeType, cf, "locale/en-US/global-platform/"); - registerChrome(chromeType, cf, "locale/en-US/global-region/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/global/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/global-platform/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/global-region/"); registerChrome(chromeType, cf, "locale/browser/"); registerChrome(chromeType, cf, "locale/browser-region/"); - registerChrome(chromeType, cf, "locale/en-US/passwordmgr/"); - registerChrome(chromeType, cf, "locale/en-US/mozapps/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/"); - registerChrome(chromeType, cf, "locale/en-US/necko/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/necko/"); #ifdef EXTENSION_PREF - registerChrome(chromeType, cf, "locale/en-US/autoconfig/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/autoconfig/"); #endif - registerChrome(chromeType, cf, "locale/en-US/cookie/"); - registerChrome(chromeType, cf, "locale/en-US/pippki/"); - registerChrome(chromeType, cf, "locale/en-US/pipnss/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/cookie/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/pippki/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/pipnss/"); #ifdef LOCALE_HAS_HELP - registerChrome(chromeType, cf, "locale/en-US/help/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/help/"); #endif #ifdef LOCALE_HAS_DOMI - registerChrome(chromeType, cf, "locale/en-US/inspector/"); + registerChrome(chromeType, cf, "locale/@AB_CD@/inspector/"); #endif + registerChrome(chromeType, cf, "locale/@AB_CD@/communicator/"); + err = performInstall(); logComment("performInstall() returned: " + err); }