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 f574d6a4 Bug 40648: Hardcode ALL in the update URL, rather than changing update.locale f574d6a4 is described below

commit f574d6a43204a2f506a6e6d1e88736c1f5abbe35 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Oct 19 17:00:05 2022 +0200

Bug 40648: Hardcode ALL in the update URL, rather than changing update.locale

Changing update.locale makes English disappear from available languages in about:preferences. --- projects/browser/build | 11 ----------- projects/firefox/build | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/projects/browser/build b/projects/browser/build index 2e037d6e..479ecde9 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -273,17 +273,6 @@ popd [% END %] [% END %]

-[% IF c("var/multi_lingual") %] - # Set the update.locale (it is used to replace %LOCALE% within - # app.update.url). - pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" - echo ${PKG_LOCALE} > update.locale - [% c("touch") %] update.locale - zip -Xm omni.ja update.locale - popd -[% END %] - - [% IF c("var/windows") %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nsis') %] export PATH="/var/tmp/dist/nsis/bin:$PATH" diff --git a/projects/firefox/build b/projects/firefox/build index 5eea651a..8ff1b5f6 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -103,7 +103,7 @@ fi

[% IF c("var/nightly") && c("var/tor-browser") -%] # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=https://nightlies.tbb.torproject.... c("var/osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%|' build/application.ini.in + sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=https://nightlies.tbb.torproject.... c("var/osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%]

add_translation () {