From f5068b6c13e2beb92b1d11bb8b87101450c60730 Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Wed, 17 Apr 2013 18:21:49 +0200 Subject: [PATCH] bug 792077, multi-locale packs should only contain select toolkit l10n files, r=mfinkle package overrides from toolkit in mobile/android/locales, make chrome-% target not descend into toolkit --HG-- extra : transplant_source : %F0%0Do%96%03k%84%E8q%B2%E9n%A515%E2%9B%E2%C2%D3 --- mobile/android/app/mobile.js | 5 +++++ mobile/android/locales/jar.mn | 32 ++++++++++++++++++++++++++++++++ mobile/locales/Makefile.in | 1 - 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index c3a1d46a1cac..90a0a66259c8 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -267,6 +267,11 @@ pref("browser.search.noCurrentEngine", true); pref("browser.search.official", true); #endif +// Enable sparse localization by setting a few package locale overrides +pref("chrome.override_package.global", "browser"); +pref("chrome.override_package.mozapps", "browser"); +pref("chrome.override_package.passwordmgr", "browser"); + // enable xul error pages pref("browser.xul.error_pages.enabled", true); diff --git a/mobile/android/locales/jar.mn b/mobile/android/locales/jar.mn index 02d598f5256a..4231df74ddc1 100644 --- a/mobile/android/locales/jar.mn +++ b/mobile/android/locales/jar.mn @@ -28,4 +28,36 @@ locale/@AB_CD@/browser/prompt.dtd (%chrome/prompt.dtd) locale/@AB_CD@/browser/feedback.dtd (%chrome/feedback.dtd) locale/@AB_CD@/browser/phishing.dtd (%chrome/phishing.dtd) + +# overrides for toolkit l10n, also for en-US +relativesrcdir toolkit/locales: + locale/@AB_CD@/browser/overrides/about.dtd (%chrome/global/about.dtd) + locale/@AB_CD@/browser/overrides/aboutAbout.dtd (%chrome/global/aboutAbout.dtd) + locale/@AB_CD@/browser/overrides/aboutRights.dtd (%chrome/global/aboutRights.dtd) + locale/@AB_CD@/browser/overrides/commonDialogs.properties (%chrome/global/commonDialogs.properties) + locale/@AB_CD@/browser/overrides/handling/handling.properties (%chrome/mozapps/handling/handling.properties) + locale/@AB_CD@/browser/overrides/intl.properties (%chrome/global/intl.properties) + locale/@AB_CD@/browser/overrides/intl.css (%chrome/global/intl.css) + locale/@AB_CD@/browser/overrides/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties) + locale/@AB_CD@/browser/overrides/search/search.properties (%chrome/search/search.properties) + locale/@AB_CD@/browser/overrides/update/updates.properties (%chrome/mozapps/update/updates.properties) + +% override chrome://global/locale/about.dtd chrome://browser/locale/overrides/about.dtd +% override chrome://global/locale/aboutAbout.dtd chrome://browser/locale/overrides/aboutAbout.dtd +% override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd +% override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties +% override chrome://mozapps/locale/handling/handling.properties chrome://browser/locale/overrides/handling/handling.properties +% override chrome://global/locale/intl.properties chrome://browser/locale/overrides/intl.properties +% override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css +% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties +% override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties +% override chrome://mozapps/locale/update/updates.properties chrome://browser/locale/overrides/update/updates.properties + +# overrides for dom l10n, also for en-US +relativesrcdir dom/locales: + locale/@AB_CD@/browser/overrides/charsetTitles.properties (%chrome/charsetTitles.properties) + locale/@AB_CD@/browser/overrides/global.dtd (%chrome/global.dtd) + +% override chrome://global/locale/charsetTitles.properties chrome://browser/locale/overrides/charsetTitles.properties +% override chrome://global/locale/global.dtd chrome://browser/locale/overrides/global.dtd locale/@AB_CD@/browser/handling.properties (%chrome/handling.properties) diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in index 4f9667089b7e..6a6053c73301 100644 --- a/mobile/locales/Makefile.in +++ b/mobile/locales/Makefile.in @@ -171,7 +171,6 @@ libs-%: $(libs-preqs) # Tailored target to just add the chrome processing for multi-locale builds chrome-%: $(display-deps) - @$(MAKE) -C $(DEPTH)/toolkit/locales chrome-$* @$(MAKE) -B $(bookmarks) AB_CD=$* @$(MAKE) -B searchplugins AB_CD=$* @$(MAKE) chrome AB_CD=$*