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.
The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push:
new af4804a47984f fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
af4804a47984f is described below
commit af4804a47984f3ca2063465ef5dc5ddbf88f71e2
Author: Richard Pospesel <richard(a)torproject.org>
AuthorDate: Tue May 3 22:47:33 2022 +0000
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
Bug 40891: Add Internet connection error when network isn't reachable
---
browser/components/torconnect/content/aboutTorConnect.css | 2 +-
browser/components/torconnect/content/aboutTorConnect.js | 4 ++--
browser/modules/TorStrings.jsm | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css
index 664a0f534835b..ae6a76db9fe75 100644
--- a/browser/components/torconnect/content/aboutTorConnect.css
+++ b/browser/components/torconnect/content/aboutTorConnect.css
@@ -316,7 +316,7 @@ body {
fill: var(--onion-color);
}
-.title.offline, .title.assit, .title.final {
+.title.offline, .title.assist, .title.final {
background-image: url("chrome://browser/content/torconnect/connection-failure.svg");
}
diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js
index 162133ee5f12f..8b5f7216e9ef8 100644
--- a/browser/components/torconnect/content/aboutTorConnect.js
+++ b/browser/components/torconnect/content/aboutTorConnect.js
@@ -514,7 +514,7 @@ class AboutTorConnect {
showOffline(error) {
this.setTitle(TorStrings.torConnect.noInternet, "offline");
- this.setLongText("Some long text from š©ļø");
+ this.setLongText(TorStrings.torConnect.noInternetDescription);
this.setProgress(error, false);
this.setBreadcrumbsStatus(
BreadcrumbStatus.Default,
@@ -529,7 +529,7 @@ class AboutTorConnect {
}
showConnectionAssistant(state) {
- this.setTitle(TorStrings.torConnect.couldNotConnect, "assit");
+ this.setTitle(TorStrings.torConnect.couldNotConnect, "assist");
this.showConfigureConnectionLink(TorStrings.torConnect.assistDescription);
this.setProgress(state?.ErrorDetails, false);
this.setBreadcrumbsStatus(
diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm
index 7a21981184b8e..1d376aaf4bf8d 100644
--- a/browser/modules/TorStrings.jsm
+++ b/browser/modules/TorStrings.jsm
@@ -514,6 +514,11 @@ var TorStrings = {
"Tor Browser couldnāt reach the Internet"
),
+ noInternetDescription: getStringNet(
+ "torConnect.noInternetDescription",
+ "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again.",
+ ),
+
torBootstrapFailed: getStringLauncher(
"tor_bootstrap_failed",
"Tor failed to establish a Tor network connection."
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.