commit 716548bcc46cd8fb3d352dac8a7c208320ba957a
Author: Erinn Clark <[email protected]>
Date: Sun Mar 10 18:10:47 2013 +0100
Windows: fix langpacks so branding displays properly for non-en-US languages
---
build-scripts/windows-alpha.mk | 6 +++++-
build-scripts/windows.mk | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index fdb8610..987200f 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -421,6 +421,8 @@ ifneq ($(LANGCODE), en-US)
FFDIR=$(BUNDLE)/FirefoxPortable/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/";
\
@@ -429,7 +431,9 @@ ifneq ($(LANGCODE), en-US)
(cd "$$FFDIR";
\
$(SEVENZIP) u -tzip "$$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
rm -fr $(DUMMYPROFILE)
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index bee5aa7..085d9e3 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -378,6 +378,8 @@ ifneq ($(LANGCODE), en-US)
FFDIR=$(BUNDLE)/FirefoxPortable/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/";
\
@@ -386,7 +388,9 @@ ifneq ($(LANGCODE), en-US)
(cd "$$FFDIR";
\
$(SEVENZIP) u -tzip "$$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
rm -fr $(DUMMYPROFILE)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
