- tbb-commits - lists.torproject.org

[torbutton] branch main updated: Bug 41451: Use app locale rather than requested locale
by gitolite role 14 Nov '22

14 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new f5cbb382 Bug 41451: Use app locale rather than requested locale f5cbb382 is described below commit f5cbb38236e1dd0c1debc8c625833c2b08fd2b9d Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Mon Nov 14 18:38:53 2022 +0000 Bug 41451: Use app locale rather than requested locale --- chrome/content/aboutTor/aboutTor-content.js | 11 ++++------- modules/utils.js | 9 +++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index a35d95b5..6c53dff8 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -19,7 +19,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { bindPrefAndInit } = ChromeUtils.import( +const { bindPrefAndInit, getLocale } = ChromeUtils.import( "resource://torbutton/modules/utils.js" ); @@ -65,10 +65,7 @@ var AboutTorListener = { onPageLoad() { // Arrange to update localized text and links. bindPrefAndInit("intl.locale.requested", () => { - const aNewVal = Services.locale.requestedLocale; - if (aNewVal !== null) { - this.onLocaleChange(aNewVal); - } + this.onLocaleChange(); }); // Add message and event listeners. @@ -116,10 +113,10 @@ var AboutTorListener = { body.setAttribute("initialized", "yes"); }, - onLocaleChange(aLocale) { + onLocaleChange() { // Set localized "Get Involved" link. content.document.getElementById("getInvolvedLink").href = - "https://community.torproject.org/" + aLocale; + `https://community.torproject.org/${getLocale()}`; // Display the Tor Browser product name and version. try { diff --git a/modules/utils.js b/modules/utils.js index 49f7c0dc..30947a73 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -88,9 +88,14 @@ var getEnv = function(name) { }; // __getLocale -// Reads the browser locale, the default locale is en-US. +// Returns the app locale to be used in tor-related urls. var getLocale = function() { - return Services.locale.requestedLocale || "en-US"; + const locale = Services.locale.appLocaleAsBCP47; + if (locale === "ja-JP-macos") { + // We don't want to distinguish the mac locale. + return "ja"; + } + return locale; }; // ## Windows -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by gitolite role 14 Nov '22

14 Nov '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new f8d051d6f08f fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser f8d051d6f08f is described below commit f8d051d6f08fc3d89edd1b69f2e0ebef8dd9aed8 Author: hackademix <giorgio(a)maone.net> AuthorDate: Fri Nov 11 00:28:00 2022 +0100 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser --- tools/torbrowser/fetch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/torbrowser/fetch.sh b/tools/torbrowser/fetch.sh index 5b5c627c0c34..f91459530553 100755 --- a/tools/torbrowser/fetch.sh +++ b/tools/torbrowser/fetch.sh @@ -7,7 +7,7 @@ BINARIES_DIR=$1 wget https://aus1.torproject.org/torbrowser/update_3/alpha/downloads.json # get url for latest alpha linux en_US package TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+") -TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_en-US.tar.xz" +TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_ALL.tar.xz" TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" # remove download manifest @@ -24,7 +24,7 @@ mkdir -p "${BINARIES_DIR}" # and extract tar -xf ${TOR_BROWSER_PACKAGE} -C "${BINARIES_DIR}" -mv "${BINARIES_DIR}/tor-browser_en-US" "${BINARIES_DIR}/dev" +mv "${BINARIES_DIR}/tor-browser" "${BINARIES_DIR}/dev" # cleanup rm -f "${TOR_BROWSER_PACKAGE}" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (e2c53373c56c -> 3c7db5829367)
by gitolite role 11 Nov '22

11 Nov '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. from e2c53373c56c fixup! Firefox preference overrides. new c33d99d17934 dropme! Bug 41426: temporarily bring back stub installer logic so we can delete it in subsequent new fixup commit; new 3c7db5829367 fixup! Base Browser's .mozconfigs. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Firefox preference overrides.
by gitolite role 10 Nov '22

10 Nov '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new e2c53373c56c fixup! Firefox preference overrides. e2c53373c56c is described below commit e2c53373c56c93b1fde33512762f790676c75880 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Wed Oct 26 21:18:43 2022 +0000 fixup! Firefox preference overrides. Bug 27258: font whitelist means we don't have to set gfx.downloadable_fonts.fallback_delay --- browser/app/profile/001-base-profile.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index 3f93614a7bbb..0d344b55eca8 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -202,7 +202,6 @@ pref("dom.push.enabled", false); // Fingerprinting pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false); -pref("gfx.downloadable_fonts.fallback_delay", -1); pref("browser.startup.homepage_override.buildID", "20100101"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) // Set video VP9 to 0 for everyone (bug 22548) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-bundle-testsuite] branch main updated (2f1fd21 -> 03ccd93)
by gitolite role 10 Nov '22

10 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch main in repository tor-browser-bundle-testsuite. from 2f1fd21 Bug 40046: add base-browser nightly builds new ff860f9 Bug 40068: Fix cleaning of old nightly builds new 73c6fcf Bug 40065: Archive multi-locale and base-browser builds new 8f3eefc Bug 40065: Keep builds from last 10 days on nightlies.tbb.torproject.org new 03ccd93 Bug 40067: Update email-to list for nightly builds The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: config/tb-build-01.torproject.org | 4 +++- rbm-config/tb-build-01.torproject.org.rbm.local.conf | 8 +++++++- tools/tb-build-01-start-nightly-build | 11 +++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 4

[builders/tor-browser-build] branch main updated: Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf
by gitolite role 10 Nov '22

10 Nov '22

This is an automated email from the git hooks/post-receive script. boklm 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 3afab9a8 Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf 3afab9a8 is described below commit 3afab9a8af2b41f6b3cb4714d94ecab690911edb Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Thu Nov 10 10:27:32 2022 +0100 Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf fixup for 98b4184d69ab7b6d55c90ef25ce6fc8005a589b8. --- rbm.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/rbm.conf b/rbm.conf index 4313cdc7..0d34a766 100644 --- a/rbm.conf +++ b/rbm.conf @@ -212,13 +212,6 @@ targets: GET c("var_p/nightly_torbrowser_version"); END; -%] - # For nightly builds, we support updates for a limited set of locales - mar_locales: - - de - - es-ES - - fr - - ru - - uk max_torbrowser_incremental_from: 2 build_infos_json: 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: fixup! Bug 40641: Use packaged locales on Firefox
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. boklm 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 60146126 fixup! Bug 40641: Use packaged locales on Firefox 60146126 is described below commit 6014612651eebc355526981f93eaa5fbc519255b Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Nov 8 14:32:56 2022 +0100 fixup! Bug 40641: Use packaged locales on Firefox Do not use firefox-l10n in testbuilds, since it is not available. --- projects/firefox/build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 10b93fdf..c6b940fa 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -134,11 +134,13 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" -l10ncentral="$HOME/.mozbuild/l10n-central" -mkdir "$l10ncentral" -for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do - tar -C "$l10ncentral" -xf "$tarball" -done +[% IF !c("var/testbuild") -%] + l10ncentral="$HOME/.mozbuild/l10n-central" + mkdir "$l10ncentral" + for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do + tar -C "$l10ncentral" -xf "$tarball" + done +[% END %] # PyYAML tries to read files as ASCII, otherwise export LC_ALL=C.UTF-8 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new ad3983f0394a fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection ad3983f0394a is described below commit ad3983f0394a9a1d979f56ecd57db29758903efb Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Nov 8 15:03:37 2022 +0100 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41437: Use the new media query for dark theme for the "Connected" pill in bridges --- browser/components/torpreferences/content/torPreferences.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 03d996ed577b..ec709a5823c1 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -284,7 +284,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { color: var(--purple-60); } -@media (-moz-toolbar-prefers-color-scheme: dark) { +@media (prefers-color-scheme: dark) { .torPreferences-bridgeCard-connectedBadge { color: var(--purple-30); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main updated: Bug 41410: Fix circuit display sizing hack for opening sub-menus.
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new 362c914b Bug 41410: Fix circuit display sizing hack for opening sub-menus. 362c914b is described below commit 362c914b5630b30e9608a218880bffa3664693f4 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Tue Nov 1 12:10:00 2022 +0000 Bug 41410: Fix circuit display sizing hack for opening sub-menus. We only apply our hack on popupshowing and popuphiding if the event target matches the panel popup. We also add a FIXME note since the sizing hack is fragile. We also use the "hidden" attribute to hide the circuit instead of setting the inline "display" style. --- chrome/content/tor-circuit-display.js | 27 ++++++++++++++++++--------- chrome/skin/tor-circuit-display.css | 6 +----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index e4b5ceea..76fb7454 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -266,9 +266,7 @@ let createTorCircuitDisplay = (function() { // __showCircuitDisplay(show)__. // If show === true, makes the circuit display visible. let showCircuitDisplay = function(show) { - document.getElementById("circuit-display-container").style.display = show - ? "block" - : "none"; + document.getElementById("circuit-display-container").hidden = !show; }; // __xmlTree(ns, data)__. @@ -404,8 +402,8 @@ let createTorCircuitDisplay = (function() { ]); // Hide the note about guards if we are using a bridge. - document.getElementById("circuit-guard-note-container").style.display = - nodeData[0].type === "bridge" ? "none" : "block"; + document.getElementById("circuit-guard-note-container").hidden = + nodeData[0].type === "bridge"; } else { // Only show the Tor circuit if we have credentials and node data. logger.eclog(4, "no SOCKS credentials found for current document."); @@ -473,7 +471,16 @@ let createTorCircuitDisplay = (function() { // __ensureCorrectPopupDimensions()__. // Make sure the identity popup always displays with the correct height. let ensureCorrectPopupDimensions = function() { - let setDimensions = () => { + // FIXME: This is hacking with the internals of the panel view, which also + // sets the width and height for transitions (see PanelMultiView.jsm), so + // this fix is fragile. + // Ideally the panel view would start using a non-XUL CSS layout, which + // would work regardless of the content. + let popupMenu = document.getElementById("identity-popup"); + let setDimensions = event => { + if (event.target !== popupMenu) { + return; + } setTimeout(() => { let view = document.querySelector( "#identity-popup-multiView .panel-viewcontainer" @@ -492,9 +499,12 @@ let createTorCircuitDisplay = (function() { view.setAttribute("width", newWidth); view.setAttribute("height", newHeight); } - }, 0); + }); }; - let removeDimensions = () => { + let removeDimensions = event => { + if (event.target !== popupMenu) { + return; + } let view = document.querySelector( "#identity-popup-multiView .panel-viewcontainer" ); @@ -509,7 +519,6 @@ let createTorCircuitDisplay = (function() { view2.style.minWidth = view2.style.maxWidth = ""; } }; - let popupMenu = document.getElementById("identity-popup"); popupMenu.addEventListener("popupshowing", setDimensions); popupMenu.addEventListener("popuphiding", removeDimensions); return () => { diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index c1dfcf79..4f03b882 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -53,7 +53,7 @@ and lines drawn between them to represent Tor network inter-relay connections. margin-bottom: 8px; } -#circuit-display-content > hbox { +#circuit-display-content > hbox:not([hidden]) { display: flex; } @@ -140,10 +140,6 @@ ul#circuit-display-nodes li:last-child { background-color: var(--button-primary-active-bgcolor); } -#circuit-guard-note-container { - -} - #circuit-guard-note-container div { margin-inline-start: 8px; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (ab28234080bc -> 047ebcbe246c)
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. from ab28234080bc fixup! Bug 40933: Add tor-launcher functionality new e94b4fd243ec fixup! Bug 2176: Rebrand Firefox to TorBrowser new 047ebcbe246c fixup! Bug 10760: Integrate TorButton to TorBrowser core The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/branding/alpha/locales/en-US/brand.dtd | 11 --------- browser/branding/alpha/locales/en-US/brand.ftl | 26 ---------------------- .../branding/alpha/locales/en-US/brand.properties | 14 ------------ browser/branding/alpha/locales/jar.mn | 8 +------ browser/branding/nightly/locales/en-US/brand.dtd | 2 +- browser/branding/nightly/locales/en-US/brand.ftl | 2 +- .../nightly/locales/en-US/brand.properties | 6 ++--- browser/branding/nightly/locales/jar.mn | 8 +------ browser/branding/official/locales/en-US/brand.dtd | 2 +- .../official/locales/en-US/brand.properties | 6 ++--- browser/branding/official/locales/jar.mn | 8 +------ browser/branding/unofficial/locales/jar.mn | 9 +------- mobile/android/branding/beta/locales/jar.mn | 9 +------- mobile/android/branding/nightly/locales/jar.mn | 9 +------- mobile/android/branding/official/locales/jar.mn | 9 +------- mobile/android/branding/unofficial/locales/jar.mn | 9 +------- toolkit/torproject/torbutton | 2 +- 17 files changed, 18 insertions(+), 122 deletions(-) delete mode 100644 browser/branding/alpha/locales/en-US/brand.dtd delete mode 100644 browser/branding/alpha/locales/en-US/brand.ftl delete mode 100644 browser/branding/alpha/locales/en-US/brand.properties -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2