This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new 1ea93eaa5400c fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 1ea93eaa5400c is described below

commit 1ea93eaa5400cc4af793235539b2c863a4194aca Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon Jul 18 16:29:49 2022 +0200

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 41059: Bridges are not shown in locales that have only the language code --- browser/components/torpreferences/content/connectionPane.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 644b13dc9cb8e..6162ca37e8faf 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -731,7 +731,7 @@ const gConnectionPane = (function() { const annotations = await res.json(); const bcp47 = Services.locale.appLocaleAsBCP47; const dash = bcp47.indexOf("-"); - const lang = dash !== -1 ? bcp47.substr(dash) : lang; + const lang = dash !== -1 ? bcp47.substr(dash) : bcp47; if (bcp47 in annotations) { emojiAnnotations = annotations[bcp47]; } else if (lang in annotations) {