[tbb-commits] [tor-browser-build/master] Bug 40057: Add localized strings

[sysrqb at torproject.org]

commit 26908460432eb06e0d812b6c2624f1b78c0dc08a
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Oct 2 19:14:37 2020 +0000

    Bug 40057: Add localized strings
---
 projects/fenix/build            |  8 ++++++++
 projects/fenix/config           |  3 +++
 projects/tba-translation/config |  2 +-
 rbm.conf                        | 30 ++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/projects/fenix/build b/projects/fenix/build
index 0613b2f..f1536f1 100644
--- a/projects/fenix/build
+++ b/projects/fenix/build
@@ -27,6 +27,7 @@ EOF
   cp -rf $distdir/application-services/maven/org $gradle_repo
   tar -C $distdir -xf [% c('input_files_by_name/android-components') %]
   cp -rf $distdir/android-components/maven/org $gradle_repo
+  tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %]
 [% END %]
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
@@ -39,6 +40,13 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
 [% IF c("var/fetch_gradle_dependencies") %]
   $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint
 [% ELSE %]
+  # Add our localized strings
+  [% FOREACH lang = c('var/locales_mobile');
+    SET lang = tmpl(lang); %]
+    # Copy our torbrowser_strings.xml at the right place
+    cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/
+  [% END %]
+
   # Prepare Glean dependencies for offline build
   tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
   # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding
diff --git a/projects/fenix/config b/projects/fenix/config
index 4d9c936..2ecc2be 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -43,6 +43,9 @@ input_files:
   - name: python
     project: python
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
+  - name: tba-translation
+    project: tba-translation
+    enable: '[% !c("var/fetch_gradle_dependencies") %]'
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index 520f570..a7df3d5 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/translation.git
 # We need to bump the commit before releasing but just pointing to a branch
 # might cause too much rebuidling of the Firefox part.
-git_hash: e93401f698cca39971395625e1f8de54b978ab88
+git_hash: 1305ed3b598574c3fc52caaefc97a845260caa8c
 version: '[% c("abbrev") %]'
diff --git a/rbm.conf b/rbm.conf
index b6e049c..8a2c8cd 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -98,6 +98,36 @@ var:
     - vi
     - zh-CN
     - zh-TW
+  locales_mobile:
+    - ar
+    - ca
+    - cs
+    - da
+    - de
+    - el
+    - es-rAR
+    - es-rES
+    - fa
+    - fr
+    - ga-rIE
+    - hu
+    - is
+    - it
+    - ja
+    - ka
+    - ko
+    - lt
+    - nl
+    - pl
+    - pt-rBR
+    - ro
+    - ru
+    - sv-rSE
+    - th
+    - tr
+    - vi
+    - zh-rCN
+    - zh-rTW
 
   sign_build: '[% ENV.RBM_SIGN_BUILD %]'
   sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'