Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: 4c6590c3 by Dan Ballard at 2023-02-13T11:46:54-08:00 fixup! Add TorStrings module for localization

bug 41080: Add new string for connection assist 'Unblock the Internet it'

- - - - - 494c9781 by Dan Ballard at 2023-02-13T11:47:45-08:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

bug 41084: change top error bar color to purple

- - - - - d1328cd0 by Dan Ballard at 2023-02-13T11:48:06-08:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

bug 41080: change 'your location' to 'unblock the internet in'

- - - - - cf3ca81b by Dan Ballard at 2023-02-13T11:48:22-08:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

bug 41084: change brdge error tryBridgeButton color to purple and dropdown label

- - - - -

5 changed files:

- browser/components/torconnect/content/aboutTorConnect.css - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/torPreferences.css - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/torConnect.properties

Changes:

===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -142,7 +142,19 @@ button { }

#locationDropdownLabel.error { - color: var(--in-content-danger-button-background) + color: var(--in-content-error-text-color) +} + +#tryBridgeButton.danger-button { + background-color: var(--purple-70); +} + +#tryBridgeButton.danger-button:hover { + background-color: var(--purple-80); +} + +#tryBridgeButton.danger-button:active { + background-color: var(--purple-90); }

/* this follows similar css in error-pages.css for buttons */

===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -764,7 +764,7 @@ class AboutTorConnect { });

this.elements.locationDropdownLabel.textContent = - TorStrings.torConnect.yourLocation; + TorStrings.torConnect.unblockInternetIn;

this.elements.tryBridgeButton.textContent = TorStrings.torConnect.tryBridge; this.elements.tryBridgeButton.addEventListener("click", () => {

===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -26,7 +26,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { }

#torPreferences-connectMessageBox.error { - background-color: var(--red-60); + background-color: var(--purple-50); color: white; }

@@ -93,15 +93,15 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { }

#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button { - background-color: var(--red-70); + background-color: var(--purple-70); }

#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button:hover { - background-color: var(--red-80); + background-color: var(--purple-80); }

#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button:active { - background-color: var(--red-90); + background-color: var(--purple-90); }

#torPreferences-connectMessageBox.warning #torPreferences-connectMessageBox-button {

===================================== browser/modules/TorStrings.jsm ===================================== @@ -253,6 +253,7 @@ const Loader = { tryAgainMessage: "Tor Browser has failed to establish a connection to the Tor Network", yourLocation: "Your Location", + unblockInternetIn: "Unblock the Internet in",

tryBridge: "Try a Bridge",

===================================== toolkit/torbutton/chrome/locale/en-US/torConnect.properties ===================================== @@ -40,6 +40,7 @@ torConnect.tryAgain=Try Again torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network torConnect.yourLocation=Your Location +torConnect.unblockInternetIn=Unblock the Internet in torConnect.tryBridge=Try a Bridge torConnect.automatic=Automatic torConnect.selectCountryRegion=Select Country or Region

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0aac5db...