[tor-commits] [tor-browser-bundle/master] Bug 10354: Fix localization issues with OSX and Windows.

[mikeperry at torproject.org]

commit 5b71529a66b7fb803d740ecb35a688c6586150f5
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Dec 11 02:56:50 2013 -0800

    Bug 10354: Fix localization issues with OSX and Windows.
    
    We forgot to copy the additional omni.ja haxx into the localization loop.
---
 gitian/descriptors/mac/gitian-bundle.yml     |    9 ++++++++-
 gitian/descriptors/windows/gitian-bundle.yml |   10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 2ef8834..edcc6d5 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -130,12 +130,19 @@ script: |
     cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG at firefox.mozilla.org.xpi
     cd ..
 
+    # FF24 puts the prefs in a different jar:
+    if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then
+       pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/
+    else
+       pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/
+    fi
+
     cd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/
     mkdir -p defaults/preferences
     cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
-    cd ../../../../../../
+    popd
 
     ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip TorBrowserBundle_$LANG.app
     rm -rf TorBrowserBundle_$LANG.app
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 5ee9056..f56c15d 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -129,12 +129,18 @@ script: |
     cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG at firefox.mozilla.org.xpi
     cd ..
 
-    cd "Tor Browser"/Browser
+    # FF24 puts the prefs in a different jar:
+    if [ -f "Tor Browser"/Browser/browser/omni.ja ]; then
+       pushd "Tor Browser"/Browser/browser/
+    else
+       pushd "Tor Browser"/Browser/
+    fi
+
     mkdir -p defaults/preferences
     cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
-    cd ../../
+    popd
 
     makensis torbrowser.nsi
     mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe