Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: a93cb13f by Pier Angelo Vendrame at 2023-08-08T18:09:08+02:00 MB 198: Enable additional languages on Mullvad Browser.

Also MB 199: Inject Mullvad Browser-specific localized strings in projects/firefox.

- - - - -

5 changed files:

- .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - projects/firefox/build - projects/firefox/config - projects/translation/config - rbm.conf

Changes:

===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -47,6 +47,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - [ ] run `make list_translation_updates-alpha` to get updated hashes - [ ] `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/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch - [ ] Update common build configs - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`

===================================== projects/firefox/build ===================================== @@ -154,6 +154,14 @@ mkdir "$HOME/.mozbuild" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" done + [% ELSIF c("var/mullvad-browser") -%] + tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-mullvad-browser') %]" + pushd "$rootdir/translation-mullvad-browser" + ln -s ja ja-JP-mac + for lang in $supported_locales; do + cp -r $lang "$l10ncentral/" + done + popd [% END -%] [% ELSE -%] supported_locales=""

===================================== projects/firefox/config ===================================== @@ -199,6 +199,10 @@ input_files: name: translation-tor-browser pkg_type: tor-browser enable: '[% c("var/tor-browser") && c("var/has_l10n") %]' + - project: translation + name: translation-mullvad-browser + pkg_type: mullvad-browser + enable: '[% c("var/mullvad-browser") && c("var/has_l10n") %]' - filename: marsigner.der enable: '[% c("var/override_updater_url") %]' - filename: namecoin-torbutton.patch

===================================== projects/translation/config ===================================== @@ -28,6 +28,12 @@ steps: targets: nightly: git_hash: 'tor-browser' + mullvad-browser: + mullvad-browser: '[% INCLUDE build %]' + git_hash: 1f736c5ae157f27df975c18bf3f2fa5f4bb5e33a + targets: + nightly: + git_hash: 'mullvad-browser' fenix: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch @@ -40,7 +46,7 @@ steps: list_updates: list_updates: | [% - FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'mullvad-browser', 'fenix' ]; branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); IF commit_hash == pc(project, "git_hash", { step => component });

===================================== rbm.conf ===================================== @@ -280,7 +280,28 @@ targets: ProjectName: MullvadBrowser exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' - locales: [] + locales: + - ar + - da + - de + - es-ES + - fa + - fi + - fr + - it + - '[% c("var/locale_ja") %]' + - ko + - my + - nb-NO + - nl + - pl + - pt-BR + - ru + - sv-SE + - th + - tr + - zh-CN + - zh-TW torbrowser_build: 'build2' torbrowser_incremental_from: - 12.5a7

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a9...