[tor-commits] [torbrowser/master] add internationalization support to windows

[erinn at torproject.org]

commit 4e7420502b7701c49871dfcb25b84780fb3e516f
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Aug 31 18:18:47 2011 +0100

    add internationalization support to windows
---
 build-scripts/config/windows-4.0.js |    1 +
 build-scripts/osx.mk                |    6 +++---
 build-scripts/windows.mk            |    2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js
index a9cbdc8..6330c6f 100644
--- a/build-scripts/config/windows-4.0.js
+++ b/build-scripts/config/windows-4.0.js
@@ -96,6 +96,7 @@ user_pref("general.buildID.override", "0");
 user_pref("general.oscpu.override", "Windows NT 6.1");
 user_pref("general.platform.override", "Win32");
 user_pref("general.productSub.override", "20100401");
+user_pref("general.useragent.locale", "SHPONKA");
 user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3");
 user_pref("general.useragent.vendor", "");
 user_pref("general.useragent.vendorSub", "");
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index fbb1f5e..e54f5bb 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -390,9 +390,8 @@ install-extensions: $(DEFAULT_EXTENSIONS)
 ## Language extensions need to be handled differently from other extensions
 install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
 ifneq ($(LANGCODE), en-US)
-	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org
-	cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/langpack_$(LANGCODE).zip
-	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org && unzip *.zip && rm *.zip)
+	mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/
+	cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org.xpi
 endif
 
 install-betterprivacy: betterprivacy.xpi
@@ -434,6 +433,7 @@ patch-firefox-language:
 ## Fix prefs.js since extensions.checkCompatibility, false doesn't work
 update-extension-pref:
 	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
 
 write-tbb-version:
 	printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index be4d957..cd39c0b 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -433,6 +433,8 @@ patch-firefox-language:
 	## Patch Firefox prefs.js
 	./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE)
 	./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE)
+	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js
+	sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js
 
 ###
 ### Utilities