[tbb-commits] [tor-browser-bundle/master] Bug 20182: Handle the special case of the ja locale in dmg2mar

[gk at torproject.org]

commit 3993fb0ee7624b8c0daaefcd9f08d1ccf0a048e1
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Oct 4 20:21:51 2016 +0200

    Bug 20182: Handle the special case of the ja locale in dmg2mar
---
 tools/dmg2mar | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/dmg2mar b/tools/dmg2mar
index 47a543a..010761e 100755
--- a/tools/dmg2mar
+++ b/tools/dmg2mar
@@ -98,7 +98,11 @@ sub convert_files {
     my $pm = Parallel::ForkManager->new(get_nbprocs);
     $pm->run_on_finish(sub { print "Finished $_[2]\n" });
     foreach my $file (get_dmg_files_from_sha256sums) {
-        my $output = "tor-browser-osx64-$file->{version}_$file->{lang}.mar";
+        # The 'ja' locale is a special case: it is called 'ja-JP-mac'
+        # internally on OSX, but the dmg file still uses 'ja' to avoid
+        # confusing users.
+        my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang};
+        my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar";
         my $step_name = "$file->{filename} -> $output";
         print "Starting $step_name\n";
         $pm->start($step_name) and next;