[tor-commits] [tor-browser-bundle/master] Bug 17122: Rename Japanese OS X bundle

[gk at torproject.org]

commit 52afb5a8e99cbd117e14f40c5450b7cc26b04f18
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Oct 29 12:25:56 2015 +0000

    Bug 17122: Rename Japanese OS X bundle
    
    In order to avoid user confusion we change the locale part in the bundle
    name from `ja-JP-mac` to `ja` like it is on other platforms we support.
    
    The workings of Tor Browser on OS X are not affected as `ja-JP-mac` is
    used internally.
---
 gitian/descriptors/mac/gitian-bundle.yml |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index e3baa3c..458d613 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -276,6 +276,10 @@ script: |
       #
       MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar
       MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app
+      # Rename the Japanese bundle to not confuse users
+      if [ "$LANG" = "ja-JP-mac" ]; then
+        LANG="ja"
+      fi
       ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/
       rm -rf ~/build/dmg/$DEST.app
     done