Bug 455145: Support for localizing Fennec, r=mfinkle
authorMark Finkle <mfinkle@mozilla.com>
Tue, 30 Sep 2008 17:03:16 -0500
changeset 64905 b373f34ef75d728746643615119f4f9ead68ec8b
parent 64904 93ff6ea892d393c666c00c0760ffa7f1985be8a0
child 64906 dc9155a2b9e82eed1c6b5dc46b37b8b14a5ca0a7
push idunknown
push userunknown
push dateunknown
reviewersmfinkle
bugs455145
Bug 455145: Support for localizing Fennec, r=mfinkle
mobile/Makefile.in
mobile/chrome/Makefile.in
mobile/chrome/jar.mn
mobile/chrome/locale/en-US/brand/brand.dtd
mobile/chrome/locale/en-US/brand/brand.properties
mobile/chrome/locale/en-US/browser.dtd
mobile/chrome/locale/en-US/browser.properties
mobile/chrome/locale/en-US/overrides/netError.dtd
mobile/chrome/locale/en-US/preferences.dtd
mobile/chrome/locale/en-US/region.properties
mobile/chrome/locale/en-US/search.properties
mobile/chrome/locale/en-US/searchplugins/amazondotcom.xml
mobile/chrome/locale/en-US/searchplugins/answers.xml
mobile/chrome/locale/en-US/searchplugins/creativecommons.xml
mobile/chrome/locale/en-US/searchplugins/eBay.xml
mobile/chrome/locale/en-US/searchplugins/google.xml
mobile/chrome/locale/en-US/searchplugins/list.txt
mobile/chrome/locale/en-US/searchplugins/wikipedia.xml
mobile/chrome/locale/en-US/searchplugins/yahoo.xml
mobile/chrome/locale/en-US/shortcuts.properties
mobile/locales/Makefile.in
mobile/locales/en-US/chrome/brand/brand.dtd
mobile/locales/en-US/chrome/brand/brand.properties
mobile/locales/en-US/chrome/browser.dtd
mobile/locales/en-US/chrome/browser.properties
mobile/locales/en-US/chrome/overrides/netError.dtd
mobile/locales/en-US/chrome/preferences.dtd
mobile/locales/en-US/chrome/region.properties
mobile/locales/en-US/chrome/search.properties
mobile/locales/en-US/chrome/searchplugins/amazondotcom.xml
mobile/locales/en-US/chrome/searchplugins/answers.xml
mobile/locales/en-US/chrome/searchplugins/creativecommons.xml
mobile/locales/en-US/chrome/searchplugins/eBay.xml
mobile/locales/en-US/chrome/searchplugins/google.xml
mobile/locales/en-US/chrome/searchplugins/list.txt
mobile/locales/en-US/chrome/searchplugins/wikipedia.xml
mobile/locales/en-US/chrome/searchplugins/yahoo.xml
mobile/locales/en-US/chrome/shortcuts.properties
mobile/locales/jar.mn
mobile/locales/l10n.ini
--- a/mobile/Makefile.in
+++ b/mobile/Makefile.in
@@ -37,11 +37,11 @@
 
 DEPTH      = ..
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS       = chrome app components
+DIRS       = chrome locales app components
 
 include $(topsrcdir)/config/rules.mk
--- a/mobile/chrome/Makefile.in
+++ b/mobile/chrome/Makefile.in
@@ -37,18 +37,11 @@
 
 DEPTH     = ../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-vpath %.xml $(srcdir)/locale/$(MOZ_UI_LOCALE)/searchplugins
-
-DEFINES   += -DAB_CD=$(MOZ_UI_LOCALE) -DPACKAGE=browser
-
-SEARCH_PLUGINS = $(shell cat $(srcdir)/locale/$(MOZ_UI_LOCALE)/searchplugins/list.txt)
-
-libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
+DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) -DPACKAGE=browser
 
 include $(topsrcdir)/config/rules.mk
--- a/mobile/chrome/jar.mn
+++ b/mobile/chrome/jar.mn
@@ -8,20 +8,17 @@ browser.jar:
   content/commandUtil.js               (content/commandUtil.js)
   content/urlbar.xml                   (content/urlbar.xml)
   content/deckbrowser.xml              (content/deckbrowser.xml)
   content/notification.xml             (content/notification.xml)
   content/browser.css                  (content/browser.css)
   content/scrollbars.css               (content/scrollbars.css)
   content/content.css                  (content/content.css)
 * content/shortcuts.js                 (content/shortcuts.js)
-% content branding %branding/
-% locale branding @AB_CD@ %branding/
-  branding/brand.dtd                   (locale/@AB_CD@/brand/brand.dtd)
-  branding/brand.properties            (locale/@AB_CD@/brand/brand.properties)
+% content branding %content/branding/
 % style chrome://mozapps/content/extensions/extensions.xul chrome://browser/skin/extensions.css
   content/preferences/richpref.xml     (content/preferences/richpref.xml)
 * content/sanitize.xul                 (content/sanitize.xul)
 * content/sanitize.js                  (content/sanitize.js)
 
 classic.jar:
 % skin browser classic/1.0 %
   browser.css                          (skin/browser.css)
@@ -51,20 +48,8 @@ classic.jar:
   images/left_sidebar_bottom.png       (skin/images/left_sidebar_bottom.png)
   images/left_buttons.png              (skin/images/left_buttons.png)
   images/right_sidebar_top.png         (skin/images/right_sidebar_top.png)
   images/right_sidebar_middle.png      (skin/images/right_sidebar_middle.png)
   images/right_sidebar_bottom.png      (skin/images/right_sidebar_bottom.png)
   images/right_buttons.png             (skin/images/right_buttons.png)
   images/panel_buttons.png             (skin/images/panel_buttons.png)
   images/panel_background.png          (skin/images/panel_background.png)
-
-@AB_CD@.jar:
-% locale browser @AB_CD@ %
-  browser.dtd                          (locale/@AB_CD@/browser.dtd)
-  browser.properties                   (locale/@AB_CD@/browser.properties)
-  shortcuts.properties                 (locale/@AB_CD@/shortcuts.properties)
-  search.properties                    (locale/@AB_CD@/search.properties)
-  region.properties                    (locale/@AB_CD@/region.properties)
-  preferences.dtd                      (locale/@AB_CD@/preferences.dtd)
-# Fennec-specific overrides of generic strings
-* netError.dtd                         (locale/@AB_CD@/overrides/netError.dtd)
-% override chrome://global/locale/netErrorApp.dtd chrome://browser/locale/netError.dtd
copy from mobile/chrome/Makefile.in
copy to mobile/locales/Makefile.in
--- a/mobile/chrome/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -34,21 +34,22 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH     = ../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
+relativesrcdir = mobile/locales
 
 include $(DEPTH)/config/autoconf.mk
 
-vpath %.xml $(srcdir)/locale/$(MOZ_UI_LOCALE)/searchplugins
+vpath %.xml $(srcdir)/$(MOZ_UI_LOCALE)/chrome/searchplugins
 
-DEFINES   += -DAB_CD=$(MOZ_UI_LOCALE) -DPACKAGE=browser
+DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) -DPACKAGE=browser
 
-SEARCH_PLUGINS = $(shell cat $(srcdir)/locale/$(MOZ_UI_LOCALE)/searchplugins/list.txt)
+SEARCH_PLUGINS = $(shell cat $(srcdir)/$(MOZ_UI_LOCALE)/chrome/searchplugins/list.txt)
 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
 include $(topsrcdir)/config/rules.mk
rename from mobile/chrome/locale/en-US/brand/brand.dtd
rename to mobile/locales/en-US/chrome/brand/brand.dtd
rename from mobile/chrome/locale/en-US/brand/brand.properties
rename to mobile/locales/en-US/chrome/brand/brand.properties
rename from mobile/chrome/locale/en-US/browser.dtd
rename to mobile/locales/en-US/chrome/browser.dtd
rename from mobile/chrome/locale/en-US/browser.properties
rename to mobile/locales/en-US/chrome/browser.properties
rename from mobile/chrome/locale/en-US/overrides/netError.dtd
rename to mobile/locales/en-US/chrome/overrides/netError.dtd
rename from mobile/chrome/locale/en-US/preferences.dtd
rename to mobile/locales/en-US/chrome/preferences.dtd
rename from mobile/chrome/locale/en-US/region.properties
rename to mobile/locales/en-US/chrome/region.properties
old mode 100755
new mode 100644
rename from mobile/chrome/locale/en-US/search.properties
rename to mobile/locales/en-US/chrome/search.properties
rename from mobile/chrome/locale/en-US/searchplugins/amazondotcom.xml
rename to mobile/locales/en-US/chrome/searchplugins/amazondotcom.xml
rename from mobile/chrome/locale/en-US/searchplugins/answers.xml
rename to mobile/locales/en-US/chrome/searchplugins/answers.xml
rename from mobile/chrome/locale/en-US/searchplugins/creativecommons.xml
rename to mobile/locales/en-US/chrome/searchplugins/creativecommons.xml
rename from mobile/chrome/locale/en-US/searchplugins/eBay.xml
rename to mobile/locales/en-US/chrome/searchplugins/eBay.xml
rename from mobile/chrome/locale/en-US/searchplugins/google.xml
rename to mobile/locales/en-US/chrome/searchplugins/google.xml
rename from mobile/chrome/locale/en-US/searchplugins/list.txt
rename to mobile/locales/en-US/chrome/searchplugins/list.txt
rename from mobile/chrome/locale/en-US/searchplugins/wikipedia.xml
rename to mobile/locales/en-US/chrome/searchplugins/wikipedia.xml
rename from mobile/chrome/locale/en-US/searchplugins/yahoo.xml
rename to mobile/locales/en-US/chrome/searchplugins/yahoo.xml
rename from mobile/chrome/locale/en-US/shortcuts.properties
rename to mobile/locales/en-US/chrome/shortcuts.properties
new file mode 100644
--- /dev/null
+++ b/mobile/locales/jar.mn
@@ -0,0 +1,16 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale browser @AB_CD@ %locale/@AB_CD@/browser/
+  locale/@AB_CD@/browser/browser.dtd              (%chrome/browser.dtd)
+  locale/@AB_CD@/browser/browser.properties       (%chrome/browser.properties)
+  locale/@AB_CD@/browser/shortcuts.properties     (%chrome/shortcuts.properties)
+  locale/@AB_CD@/browser/search.properties        (%chrome/search.properties)
+  locale/@AB_CD@/browser/region.properties        (%chrome/region.properties)
+  locale/@AB_CD@/browser/preferences.dtd          (%chrome/preferences.dtd)
+# Fennec-specific overrides of generic strings
+* locale/@AB_CD@/browser/netError.dtd             (%chrome/overrides/netError.dtd)
+% override chrome://global/locale/netErrorApp.dtd chrome://browser/locale/netError.dtd
+% locale branding @AB_CD@ %locale/@AB_CD@/branding/
+  locale/@AB_CD@/branding/brand.dtd               (%chrome/brand/brand.dtd)
+  locale/@AB_CD@/branding/brand.properties        (%chrome/brand/brand.properties)
new file mode 100644
--- /dev/null
+++ b/mobile/locales/l10n.ini
@@ -0,0 +1,9 @@
+[general]
+depth = ../..
+all = mobile/locales/all-locales
+
+[compare]
+dirs = mobile
+
+[includes]
+toolkit = toolkit/locales/l10n.ini