[tbb-commits] [builders/tor-browser-build] branch main updated: Bug 17400: Enable multi-lingual builds

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch main
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push:
     new a3f4912  Bug 17400: Enable multi-lingual builds
a3f4912 is described below

commit a3f49129c0c697eb7e951c871b8bfa8dd2e1fe27
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Fri Oct 7 18:16:58 2022 +0200

    Bug 17400: Enable multi-lingual builds
---
 projects/browser/build                  | 10 ++++++----
 projects/browser/config                 |  2 +-
 rbm.conf                                |  2 +-
 tools/update-responses/update_responses |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/projects/browser/build b/projects/browser/build
index 6a7ef9a..2e037d6 100644
--- a/projects/browser/build
+++ b/projects/browser/build
@@ -223,7 +223,7 @@ tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude
 
 pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/"
 unzip omni.ja defaults/preferences/[% c("var/prefs_file") %] || [ $? -lt 3 ]
-# Append our built extension-overrides.js to 000-tor-browser.js
+# Append our built extension-overrides.js to the preferences file
 cat "$GENERATEDPREFSPATH" >> defaults/preferences/[% c("var/prefs_file") %]
 cp defaults/preferences/[% c("var/prefs_file") %] $rootdir
 [% IF c("var/osx") %]
@@ -235,8 +235,6 @@ cp defaults/preferences/[% c("var/prefs_file") %] $rootdir
   zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html
   rm -rf chrome
 [% END %]
-# Set the locale of the bundle.
-echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/[% c("var/prefs_file") %]
 [% c("touch") %] defaults/preferences/[% c("var/prefs_file") %]
 zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %]
 rm -rf defaults
@@ -247,7 +245,11 @@ popd
 [% IF c("var/osx") || c("var/multi_lingual") -%]
   # Prepare our language packs to embed our default bookmarks.
   # See bug 21879 for more details.
-  [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%]
+  [% IF c("var/multi_lingual") -%]
+    [% SET locales = c("var/locales") -%]
+  [% ELSE -%]
+    [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%]
+  [% END -%]
   [% FOREACH lang = locales %]
   [% SET lang = tmpl(lang);
      SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi';
diff --git a/projects/browser/config b/projects/browser/config
index 10b7eb9..4ae3e4f 100644
--- a/projects/browser/config
+++ b/projects/browser/config
@@ -75,7 +75,7 @@ input_files:
     enable: '[% c("var/tor-browser") %]'
   - project: firefox-langpacks
     name: firefox-langpacks
-    enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
+    enable: '[% (!c("var/testbuild") || c("var/multi_lingual")) && ! c("var/android") %]'
   - project: fonts
     name: fonts
     enable: '[% ! c("var/android") %]'
diff --git a/rbm.conf b/rbm.conf
index 97baa32..02c8074 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -75,7 +75,7 @@ var:
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 12.0a2
-  multi_lingual: 0
+  multi_lingual: 1
   build_mar: 1
   # By default, we sort the list of installed packages. This allows sharing
   # containers with identical list of packages, even if they are not listed
diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses
index 7881205..af81875 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -411,7 +411,7 @@ sub write_htaccess {
                     $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang "
                               .  "$version-$os-$migrate_langs->{$lang}.xml $flags\n";
                 }
-                $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n";
+                $htaccess .= "RewriteRule ^$bt/ $version-$os-ALL.xml $flags\n";
             }
         }
         write_htdocs($channel, '.htaccess', $htaccess);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.