commit 503812ba5521260e7fdb466c0329f8552ff3d4b6 Author: Erinn Clark erinn@torproject.org Date: Sun Mar 10 18:39:46 2013 +0100

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

diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 721c943..65227e8 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -440,6 +440,8 @@ ifneq ($(LANGCODE), en-US) FFDIR=$(BUNDLE)/Data/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/"; \ @@ -447,7 +449,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/linux.mk b/build-scripts/linux.mk index f5d71e4..09faf3a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -403,6 +403,8 @@ ifneq ($(LANGCODE), en-US) FFDIR=$(BUNDLE)/Data/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/"; \ @@ -410,7 +412,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