[tor-commits] [torbrowser/maint-2.4] OSX: fix langpacks so branding displays properly for non-en-US languages

[erinn at torproject.org]

commit 0cc60c313af7ebd80195120c5f0dc58f71d36a08
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Mar 10 17:54:26 2013 +0100

    OSX: fix langpacks so branding displays properly for non-en-US languages
---
 build-scripts/osx-alpha.mk |    6 +++++-
 build-scripts/osx.mk       |   10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index db1064f..31f15d8 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -436,6 +436,8 @@ ifneq ($(LANGCODE), en-US)
 	FFDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/;	\
 	CHROMEDIR="$$FFDIR/chrome/";											\
 	mkdir -p "$$CHROMEDIR/$$LC/locale/branding";							\
+	cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.dtd "$$CHROMEDIR/$$LC/locale/branding";											\
+	cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.properties "$$CHROMEDIR/$$LC/locale/branding";										\
 	mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region";						\
 	cp config/region.properties											\
 		"$$CHROMEDIR/$$LC/locale/browser-region/";							\
@@ -443,7 +445,9 @@ ifneq ($(LANGCODE), en-US)
 		> "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties";		\
 	(cd "$$FFDIR";													\
 		zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \
-                       "chrome/$$LC/locale/browser-region/region.properties"); \
+                       "chrome/$$LC/locale/browser-region/region.properties" \
+                       "chrome/$$LC/locale/branding/brand.dtd" \
+                       "chrome/$$LC/locale/branding/brand.properties"); \
 	rm -rf "$$CHROMEDIR"
 
 endif
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 3f52fb7..2df3785 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -101,7 +101,7 @@ TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(B
 
 build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
 	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
-	cp branding/* $(FIREFOX_DIR)/browser/branding/official
+	cp -r branding/* $(FIREFOX_DIR)/browser/branding/official
 	cd $(FIREFOX_DIR) && make -f client.mk build
 	cd $(FIREFOX_DIR) && make -C obj* package
 	touch $(STAMP_DIR)/build-firefox
@@ -293,7 +293,7 @@ configure-apps:
 		> "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties";		\
 	(cd "$$FFDIR";													\
 		zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \
-                       "chrome/$$LC/locale/browser-region/region.properties"); \
+			"chrome/$$LC/locale/browser-region/region.properties"); \
 	rm -rf "$$CHROMEDIR"
 
 	cp config/Info.plist $(DEST)/Contents
@@ -376,6 +376,8 @@ ifneq ($(LANGCODE), en-US)
 	FFDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/;	\
 	CHROMEDIR="$$FFDIR/chrome/";											\
 	mkdir -p "$$CHROMEDIR/$$LC/locale/branding";							\
+	cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.dtd "$$CHROMEDIR/$$LC/locale/branding";											\
+	cp $(FIREFOX_DIR)/browser/branding/official/locales/en-US/brand.properties "$$CHROMEDIR/$$LC/locale/branding";										\
 	mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region";						\
 	cp config/region.properties											\
 		"$$CHROMEDIR/$$LC/locale/browser-region/";							\
@@ -383,7 +385,9 @@ ifneq ($(LANGCODE), en-US)
 		> "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties";		\
 	(cd "$$FFDIR";													\
 		zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \
-                       "chrome/$$LC/locale/browser-region/region.properties"); \
+			"chrome/$$LC/locale/browser-region/region.properties" \
+			"chrome/$$LC/locale/branding/brand.dtd" \
+			"chrome/$$LC/locale/branding/brand.properties"); \
 	rm -rf "$$CHROMEDIR"
 
 endif