[tbb-commits] [tor-browser] 03/08: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

[gitolite role]

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

richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1
in repository tor-browser.

commit f124595ba4221bbd6030554a2199564e7be38f79
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Tue Jun 14 11:42:18 2022 +0200

    fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
    
    Update Manual URLs
---
 .../torpreferences/content/builtinBridgeDialog.jsm         |  2 +-
 .../components/torpreferences/content/connectionPane.js    | 14 +++++++++++++-
 .../torpreferences/content/provideBridgeDialog.jsm         |  2 +-
 .../torpreferences/content/requestBridgeDialog.jsm         |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/browser/components/torpreferences/content/builtinBridgeDialog.jsm b/browser/components/torpreferences/content/builtinBridgeDialog.jsm
index c03e83178f26c..948ddb6b6de10 100644
--- a/browser/components/torpreferences/content/builtinBridgeDialog.jsm
+++ b/browser/components/torpreferences/content/builtinBridgeDialog.jsm
@@ -88,7 +88,7 @@ class BuiltinBridgeDialog {
     });
     this._dialog.addEventListener("dialoghelp", e => {
       window.top.openTrustedLinkIn(
-        "https://tb-manual.torproject.org/circumvention/",
+        TorStrings.settings.learnMoreCircumventionURL,
         "tab"
       );
     });
diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js
index 292123b0712c4..8d6d10fc83411 100644
--- a/browser/components/torpreferences/content/connectionPane.js
+++ b/browser/components/torpreferences/content/connectionPane.js
@@ -242,6 +242,9 @@ const gConnectionPane = (function() {
           "href",
           TorStrings.settings.learnMoreTorBrowserURL
         );
+        if (TorStrings.settings.learnMoreTorBrowserURL.startsWith("about:")) {
+          learnMore.setAttribute("useoriginprincipal", "true");
+        }
       }
 
       // Internet and Tor status
@@ -328,6 +331,9 @@ const gConnectionPane = (function() {
         let learnMore = prefpane.querySelector(selectors.bridges.learnMore);
         learnMore.setAttribute("value", TorStrings.settings.learnMore);
         learnMore.setAttribute("href", TorStrings.settings.learnMoreBridgesURL);
+        if (TorStrings.settings.learnMoreBridgesURL.startsWith("about:")) {
+          learnMore.setAttribute("useoriginprincipal", "true");
+        }
       }
 
       // Location
@@ -440,7 +446,13 @@ const gConnectionPane = (function() {
           selectors.bridges.cardLearnMore
         );
         learnMore.setAttribute("value", TorStrings.settings.learnMore);
-        learnMore.setAttribute("href", "about:blank");
+        learnMore.setAttribute(
+          "href",
+          TorStrings.settings.learnMoreBridgesCardURL
+        );
+        if (TorStrings.settings.learnMoreBridgesCardURL.startsWith("about:")) {
+          learnMore.setAttribute("useoriginprincipal", "true");
+        }
       }
       bridgeTemplate.querySelector(
         selectors.bridges.cardConnectedLabel
diff --git a/browser/components/torpreferences/content/provideBridgeDialog.jsm b/browser/components/torpreferences/content/provideBridgeDialog.jsm
index 2e858bc338008..f20cf9ddd925d 100644
--- a/browser/components/torpreferences/content/provideBridgeDialog.jsm
+++ b/browser/components/torpreferences/content/provideBridgeDialog.jsm
@@ -47,7 +47,7 @@ class ProvideBridgeDialog {
     });
     this._dialog.addEventListener("dialoghelp", e => {
       window.top.openTrustedLinkIn(
-        "https://tb-manual.torproject.org/bridges/",
+        TorStrings.settings.learnMoreBridgesURL,
         "tab"
       );
     });
diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm
index f14bbdcbbb448..9b8cd6db0a9b9 100644
--- a/browser/components/torpreferences/content/requestBridgeDialog.jsm
+++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm
@@ -68,7 +68,7 @@ class RequestBridgeDialog {
     });
     this._dialog.addEventListener("dialoghelp", e => {
       window.top.openTrustedLinkIn(
-        "https://tb-manual.torproject.org/bridges/",
+        TorStrings.settings.learnMoreBridgesURL,
         "tab"
       );
     });

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.