Bug 40713: Inject torbutton translations during the build (42660210) · Commits · The Tor Project / Applications / tor-browser-build

.gitlab/issue_templates/Release Prep - Alpha.md

+5 −10

Original line number	Diff line number	Diff line
		@@ -125,16 +125,11 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
		- [ ] Update `projects/firefox/config`
		- [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
		- [ ] *(Optional)* `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
		- [ ] Update `projects/translation-base-browser/config`
		- [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch
		- [ ] Update `projects/translation-base-browser-fluent/config`
		- [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
		- [ ] *(Optional)* Update Android-specific build configs
		- [ ] *(Optional)* Update `projects/geckoview/config`
		- [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
		- [ ] *(Optional)* `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased
		- [ ] Update `projects/tba-translations/config`:
		- [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
		- [ ] Update `projects/translation/config`:
		- [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
		- [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
		- [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch
		- [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
		- [ ] *(Optional)* Update `projects/tor-android-service/config`
		- [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
		- [ ] *(Optional)* Update `projects/application-services/config`:

projects/fenix/build

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ EOF
		nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus
		mkdir -p $nimbusdir
		cp $distdir/application-services/nimbus-fml $nimbusdir/
		tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %]
		tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %]
		[% END %]
		tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

		@@ -60,7 +60,7 @@ v=[% c("variant") %]
		[% 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 %]/
		cp /var/tmp/dist/translation-fenix/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/
		[% END %]

		# Prepare Glean dependencies for offline build

projects/fenix/config

+3 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,9 @@ input_files:
		project: geckoview
		pkg_type: merge_aars
		enable: '[% !c("var/android_single_arch") %]'
		- name: tba-translation
		project: tba-translation
		- name: translation-fenix
		project: translation
		pkg_type: fenix
		- filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
		name: gradle-dependencies
		exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

projects/firefox/build

+20 −5

Original line number	Diff line number	Diff line
		@@ -62,6 +62,10 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %]

		tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
		transl_base_browser=$rootdir/translation-base-browser
		[% IF c("var/tor-browser") -%]
		tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
		transl_tor_browser=$rootdir/translation-tor-browser
		[% END -%]

		cd /var/tmp/build/[% project %]-[% c("version") %]
		cat > .mozconfig << 'MOZCONFIG_EOF'
		@@ -108,11 +112,6 @@ add_translation () {
		component=$2
		lang=$3
		filename=$4
		[% IF c("var/macos") -%]
		if [ "$lang" == "ja-JP-mac" ]; then
		lang="ja"
		fi
		[% END-%]

		mkdir "browser/components/$component/locale/$lang"
		cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/"
		@@ -121,9 +120,25 @@ add_translation () {
		}

		supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
		[% IF c("var/tor-browser") -%]
		torbutton_locales="toolkit/torbutton/chrome/locale/"
		torbutton_jar="toolkit/torbutton/jar.mn"
		[% END -%]
		for lang in $supported_locales; do
		[% IF c("var/macos") -%]
		if [ "$lang" == "ja-JP-mac" ]; then
		lang="ja"
		fi
		[% END-%]

		add_translation $transl_base_browser newidentity $lang newIdentity.properties
		add_translation $transl_base_browser securitylevel $lang securityLevel.properties

		[% IF c("var/tor-browser") -%]
		mv "$transl_tor_browser/$lang" "$torbutton_locales/"
		echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar"
		echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar"
		[% END -%]
		done

		rm -f configure

projects/firefox/config

+8 −2

Original line number	Diff line number	Diff line
		@@ -181,11 +181,17 @@ input_files:
		enable: '[% c("var/linux") %]'
		- filename: start-firefox
		enable: '[% c("var/linux") %]'
		- project: translation-base-browser
		- project: translation
		name: translation-base-browser
		- project: translation-base-browser-fluent
		pkg_type: base-browser
		- project: translation
		name: translation-base-browser-fluent
		pkg_type: base-browser-fluent
		enable: '[% !c("var/testbuild") %]'
		- project: translation
		name: translation-tor-browser
		pkg_type: tor-browser
		enable: '[% c("var/tor-browser") %]'
		- filename: namecoin-torbutton.patch
		enable: '[% c("var/namecoin") %]'
		# TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin