This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser.
commit c6c168edef9ed7ff0c6b792dc127c4085a7993ae Author: Richard Pospesel richard@torproject.org AuthorDate: Tue May 3 21:15:46 2022 +0000
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 40896: [Connection Settings] Update strings for current bridges --- browser/components/torpreferences/content/connectionPane.js | 4 ++++ browser/components/torpreferences/content/connectionPane.xhtml | 3 +++ browser/modules/TorStrings.jsm | 1 + 3 files changed, 8 insertions(+)
diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 2d3bb8bdfb601..dfb8b00d81384 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -110,6 +110,7 @@ const gConnectionPane = (function() { chooseForMe: "#torPreferences-bridges-buttonChooseBridgeForMe", currentHeader: "#torPreferences-currentBridges-header", currentHeaderText: "#torPreferences-currentBridges-headerText", + currentDescriptionText: "#torPreferences-currentBridges-description", switch: "#torPreferences-currentBridges-switch", cards: "#torPreferences-currentBridges-cards", cardTemplate: "#torPreferences-bridgeCard-template", @@ -428,6 +429,9 @@ const gConnectionPane = (function() { this._populateBridgeCards(); }); }); + prefpane.querySelector( + selectors.bridges.currentDescriptionText + ).textContent = TorStrings.settings.bridgeCurrentDescription; const bridgeTemplate = prefpane.querySelector( selectors.bridges.cardTemplate ); diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index 049cf77aa05dc..39a9c184502f0 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -93,6 +93,9 @@ <html:span id="torPreferences-currentBridges-headerText"/> <html:input type="checkbox" id="torPreferences-currentBridges-switch" class="toggle-button"/> </html:h2> + <description flex="1"> + <html:span id="torPreferences-currentBridges-description"/> + </description> <menupopup id="torPreferences-bridgeCard-menu"/> <vbox id="torPreferences-bridgeCard-template" class="torPreferences-bridgeCard"> <hbox class="torPreferences-bridgeCard-heading"> diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 028d4e27fe709..7a21981184b8e 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -286,6 +286,7 @@ var TorStrings = { bridgeLocationOther: getString("torPreferences.bridgeLocationOther", "Other locations"), bridgeChooseForMe: getString("torPreferences.bridgeChooseForMe", "Choose a Bridge For Me\u2026"), bridgeCurrent: getString("torPreferences.bridgeBadgeCurrent", "Your Current Bridges"), + bridgeCurrentDescription: getString("torPreferences.bridgeBadgeCurrentDescription", "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed."), bridgeId: getString("torPreferences.bridgeId", "#1 bridge: #2"), remove: getString("torPreferences.remove", "Remove"), bridgeDisableBuiltIn: getString("torPreferences.bridgeDisableBuiltIn", "Disable built-in bridges"),