Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser
Commits:
94b53ebc by Pier Angelo Vendrame at 2024-08-12T11:51:21+02:00
fixup! Bug 40309: Avoid using regional OS locales
Bug 42349: Change the RFPTarget in the region spoofing.
One of our patches makes sure that when spoof English is not in use, we
report the same locale as the app language, instead of reporting the OS
locale (which is Firefox's default behavior when the app and OS
languages are the same).
When rebasing onto 128, we broke this patch because we had to specify
an RFPTarget, and I chose RFPTarget::JSLocale.
This is the only target that can be disabled even when running RFP
instead of FFP, because it is controlled by privacy.spoof_english.
- - - - -
8904c0be by Pier Angelo Vendrame at 2024-08-12T11:51:22+02:00
fixup! Firefox preference overrides.
Add some notes about live-reload, discovered while investigating some
localization issues.
- - - - -
2 changed files:
- browser/app/profile/001-base-profile.js
- intl/locale/LocaleService.cpp
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -622,6 +622,9 @@ pref("corroborator.enabled", false);
// tor-browser#41417: do not allow live reload until we switch to Fluent and
// stop using .textContent.
+// Even after that, it might be a good idea to keep it off, as it is not handled
+// very well, and it might give a window during which websites could fingerprint
+// the change (see tor-browser#42349 and tor-browser#42771).
pref("intl.multilingual.liveReload", false);
// Enable URL query stripping to protect against cross-site tracking (tor-browser#41092)
=====================================
intl/locale/LocaleService.cpp
=====================================
@@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) {
NS_IMETHODIMP
LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) {
+ // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof
+ // English. So, we use another target for now.
if (nsContentUtils::ShouldResistFingerprinting(
"This is probably a patch that should be refined. But to get the "
"build going, we just keep applying this generic check.",
- RFPTarget::JSLocale)) {
+ RFPTarget::JSDateTimeUTC)) {
GetAppLocalesAsBCP47(aRetVal);
return NS_OK;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cf…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cf…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
b841c294 by Pier Angelo Vendrame at 2024-08-12T11:48:58+02:00
fixup! Bug 40309: Avoid using regional OS locales
Bug 42349: Change the RFPTarget in the region spoofing.
One of our patches makes sure that when spoof English is not in use, we
report the same locale as the app language, instead of reporting the OS
locale (which is Firefox's default behavior when the app and OS
languages are the same).
When rebasing onto 128, we broke this patch because we had to specify
an RFPTarget, and I chose RFPTarget::JSLocale.
This is the only target that can be disabled even when running RFP
instead of FFP, because it is controlled by privacy.spoof_english.
- - - - -
7d1059f5 by Pier Angelo Vendrame at 2024-08-12T11:48:59+02:00
fixup! Firefox preference overrides.
Add some notes about live-reload, discovered while investigating some
localization issues.
- - - - -
2 changed files:
- browser/app/profile/001-base-profile.js
- intl/locale/LocaleService.cpp
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -624,6 +624,9 @@ pref("corroborator.enabled", false);
// tor-browser#41417: do not allow live reload until we switch to Fluent and
// stop using .textContent.
+// Even after that, it might be a good idea to keep it off, as it is not handled
+// very well, and it might give a window during which websites could fingerprint
+// the change (see tor-browser#42349 and tor-browser#42771).
pref("intl.multilingual.liveReload", false);
// Enable URL query stripping to protect against cross-site tracking (tor-browser#41092)
=====================================
intl/locale/LocaleService.cpp
=====================================
@@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) {
NS_IMETHODIMP
LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) {
+ // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof
+ // English. So, we use another target for now.
if (nsContentUtils::ShouldResistFingerprinting(
"This is probably a patch that should be refined. But to get the "
"build going, we just keep applying this generic check.",
- RFPTarget::JSLocale)) {
+ RFPTarget::JSDateTimeUTC)) {
GetAppLocalesAsBCP47(aRetVal);
return NS_OK;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/562aec…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/562aec…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
98b8bdd4 by Pier Angelo Vendrame at 2024-08-08T19:12:40+02:00
fixup! Bug 40309: Avoid using regional OS locales
Bug 42349: Change the RFPTarget in the region spoofing.
One of our patches makes sure that when spoof English is not in use, we
report the same locale as the app language, instead of reporting the OS
locale (which is Firefox's default behavior when the app and OS
languages are the same).
When rebasing onto 128, we broke this patch because we had to specify
an RFPTarget, and I chose RFPTarget::JSLocale.
This is the only target that can be disabled even when running RFP
instead of FFP, because it is controlled by privacy.spoof_english.
- - - - -
402c32c1 by Pier Angelo Vendrame at 2024-08-08T19:12:56+02:00
fixup! Firefox preference overrides.
Add some notes about live-reload, discovered while investigating some
localization issues.
- - - - -
2 changed files:
- browser/app/profile/001-base-profile.js
- intl/locale/LocaleService.cpp
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -624,6 +624,9 @@ pref("corroborator.enabled", false);
// tor-browser#41417: do not allow live reload until we switch to Fluent and
// stop using .textContent.
+// Even after that, it might be a good idea to keep it off, as it is not handled
+// very well, and it might give a window during which websites could fingerprint
+// the change (see tor-browser#42349 and tor-browser#42771).
pref("intl.multilingual.liveReload", false);
// Enable URL query stripping to protect against cross-site tracking (tor-browser#41092)
=====================================
intl/locale/LocaleService.cpp
=====================================
@@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) {
NS_IMETHODIMP
LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) {
+ // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof
+ // English. So, we use another target for now.
if (nsContentUtils::ShouldResistFingerprinting(
"This is probably a patch that should be refined. But to get the "
"build going, we just keep applying this generic check.",
- RFPTarget::JSLocale)) {
+ RFPTarget::JSDateTimeUTC)) {
GetAppLocalesAsBCP47(aRetVal);
return NS_OK;
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/292271…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/292271…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
292271b7 by Henry Wilkes at 2024-08-08T17:52:46+01:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42695: Use --arrowpanel variables instead of em units in the tor
circuit display.
- - - - -
1 changed file:
- browser/components/torcircuit/content/torCircuitPanel.css
Changes:
=====================================
browser/components/torcircuit/content/torCircuitPanel.css
=====================================
@@ -60,8 +60,8 @@
}
#tor-circuit-alias:not([hidden]) {
- /* Same margin as .panel-header > h1 */
- margin: 4px 0;
+ /* Same as padding for .panel-header */
+ margin-block-start: var(--arrowpanel-menuitem-margin-inline);
display: flex;
align-items: center;
}
@@ -83,8 +83,10 @@
#tor-circuit-panel-body {
/* May grow larger than 480px if we have a long domain name or ip address. */
min-width: 480px;
- padding: 1em;
- gap: 1em;
+ /* Line up with the button at the bottom of the panel. */
+ margin: var(--arrowpanel-menuitem-margin);
+ padding: var(--arrowpanel-menuitem-padding);
+ gap: var(--arrowpanel-menuitem-padding-block);
}
#tor-circuit-node-list-name,
@@ -95,7 +97,7 @@
#tor-circuit-node-list {
line-height: 2;
list-style: none;
- padding-inline-start: 0.5em;
+ padding-inline-start: var(--arrowpanel-menuitem-margin-inline);
/* Do not allow an item to wrap since this would break the circuit diagram. */
white-space: nowrap;
}
@@ -181,5 +183,5 @@
}
.tor-circuit-button label.tor-circuit-button-description {
- margin-block-start: 3px;
+ margin-block-start: var(--space-xsmall);
}
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/292271b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/292271b…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
786db184 by Henry Wilkes at 2024-08-08T15:24:27+01:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 42700: Remove !nodes condition from circuit panel.
Also updated comment.
- - - - -
1 changed file:
- browser/components/torcircuit/content/torCircuitPanel.js
Changes:
=====================================
browser/components/torcircuit/content/torCircuitPanel.js
=====================================
@@ -317,12 +317,11 @@ var gTorCircuitPanel = {
this._currentBrowserData.domain === domain &&
this._currentBrowserData.scheme === scheme &&
this._currentBrowserData.nodes.length === nodes.length &&
- // If non-null, the fingerprints of the nodes match.
- (!nodes ||
- nodes.every(
- (n, index) =>
- n.fingerprint === this._currentBrowserData.nodes[index].fingerprint
- ))
+ // The fingerprints of the nodes match.
+ nodes.every(
+ (n, index) =>
+ n.fingerprint === this._currentBrowserData.nodes[index].fingerprint
+ )
) {
// No change.
this._log.debug(
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/786db18…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/786db18…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
84eaa764 by Henry Wilkes at 2024-08-08T10:30:14+01:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 42663: Add tooltip text to the "Connection" category.
- - - - -
1208a39d by Henry Wilkes at 2024-08-08T10:35:05+01:00
fixup! Tor Browser strings
Bug 42663: Add tooltip text to the "Connection" category.
- - - - -
2 changed files:
- browser/components/torpreferences/content/connectionCategory.inc.xhtml
- toolkit/locales/en-US/toolkit/global/tor-browser.ftl
Changes:
=====================================
browser/components/torpreferences/content/connectionCategory.inc.xhtml
=====================================
@@ -2,6 +2,8 @@
class="category"
value="paneConnection"
helpTopic="prefs-connection"
+ data-l10n-id="tor-connection-settings-category"
+ data-l10n-attrs="tooltiptext"
align="center"
hidden="true">
<image class="category-icon"/>
=====================================
toolkit/locales/en-US/toolkit/global/tor-browser.ftl
=====================================
@@ -49,6 +49,10 @@ home-mode-choice-tor =
# "Connection" refers to the Tor Browser's connection to the Tor network.
tor-connection-settings-heading = Connection
+# The tooltip text for the "Connection" settings, shown in the preferences side bar.
+# Likely should just be "{ tor-connection-settings-heading }", which will match the displayed text exactly.
+tor-connection-settings-category =
+ .tooltiptext = { tor-connection-settings-heading }
# -brand-short-name refers to 'Tor Browser', localized.
tor-connection-overview = { -brand-short-name } routes your traffic over the Tor Network, run by thousands of volunteers around the world.
tor-connection-browser-learn-more-link = Learn more
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a97c2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a97c2…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
6da32b42 by Pier Angelo Vendrame at 2024-08-08T11:16:04+02:00
fixup! Bug 42347: Add a notification for dropped OS version support.
Bug 43021: Revert "Bug 42347: Add a notification for dropped OS version support."
This reverts commit d92ee42bf0523425b33583006fc94c787dca55cb.
- - - - -
562aeca5 by Pier Angelo Vendrame at 2024-08-08T11:16:05+02:00
fixup! Base Browser strings
This reverts commit 900fb923a95ec97a9c843085759fa08d961bd92c.
- - - - -
4 changed files:
- browser/base/content/browser.xhtml
- − browser/base/content/droppedSupportNotification.js
- browser/base/jar.mn
- toolkit/locales/en-US/toolkit/global/base-browser.ftl
Changes:
=====================================
browser/base/content/browser.xhtml
=====================================
@@ -129,7 +129,6 @@
Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
- Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this);
window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
=====================================
browser/base/content/droppedSupportNotification.js deleted
=====================================
@@ -1,69 +0,0 @@
-"use strict";
-
-// Show a prompt that a user's system will no longer be supported.
-window.addEventListener("load", () => {
- let labelId;
- // Expire date is 2024-10-01 (1st October 2024).
- const isExpired = Date.now() > Date.UTC(2024, 9, 1);
-
- if (
- AppConstants.platform === "macosx" &&
- Services.vc.compare(
- Services.sysinfo.getProperty("version"),
- "19.0" // MacOS 10.15 begins with Darwin 19.0
- ) < 0
- ) {
- labelId = isExpired
- ? "dropped-support-notification-macos-version-less-than-10-15-expired"
- : "dropped-support-notification-macos-version-less-than-10-15";
- } else if (
- AppConstants.platform === "win" &&
- Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0
- ) {
- labelId = isExpired
- ? "dropped-support-notification-win-os-version-less-than-10-expired"
- : "dropped-support-notification-win-os-version-less-than-10";
- }
-
- const dismissedPref =
- "browser.dropped_support_notification_v14.dismiss_version";
-
- if (!labelId) {
- // Avoid setting any preferences for supported versions, and clean up any
- // old values if the user ported their profile.
- Services.prefs.clearUserPref(dismissedPref);
- return;
- }
-
- if (
- !isExpired &&
- Services.prefs.getStringPref(dismissedPref, "") ===
- AppConstants.BASE_BROWSER_VERSION
- ) {
- // Already dismissed since the last update.
- return;
- }
-
- const buttons = isExpired
- ? undefined
- : [
- {
- "l10n-id": "dropped-support-notification-dismiss-button",
- callback: () => {
- Services.prefs.setStringPref(
- dismissedPref,
- AppConstants.BASE_BROWSER_VERSION
- );
- },
- },
- ];
-
- gNotificationBox.appendNotification(
- "dropped-support-notification",
- {
- label: { "l10n-id": labelId },
- priority: gNotificationBox.PRIORITY_WARNING_HIGH,
- },
- buttons
- );
-});
=====================================
browser/base/jar.mn
=====================================
@@ -99,5 +99,4 @@ browser.jar:
content/browser/spotlight.js (content/spotlight.js)
* content/browser/default-bookmarks.html (content/default-bookmarks.html)
- content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js)
content/browser/languageNotification.js (content/languageNotification.js)
=====================================
toolkit/locales/en-US/toolkit/global/base-browser.ftl
=====================================
@@ -166,21 +166,3 @@ security-level-summary-custom = Your custom browser preferences have resulted in
# Button to undo custom changes to the security level and place the user in one of the standard security levels.
# Shown in the security level panel and settings.
security-level-restore-defaults-button = Restore defaults
-
-## Notification for dropped operating system support.
-
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "14.0" refers to the browser versions number: Tor Browser 14.0.
-# "macOS" is a brand name, and 10.15 is the macOS version number.
-dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "macOS" is a brand name, and 10.15 is the macOS version number.
-dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "14.0" refers to the browser versions number: Tor Browser 14.0.
-# "Windows" is a brand name, and "Windows 10" is the version.
-dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "Windows" is a brand name, and "Windows 10" is the version.
-dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates.
-dropped-support-notification-dismiss-button = Got it
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a67e45…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a67e45…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser
Commits:
82a0c757 by Pier Angelo Vendrame at 2024-08-08T11:12:20+02:00
fixup! Bug 42347: Add a notification for dropped OS version support.
Bug 43021: Revert "Bug 42347: Add a notification for dropped OS version support."
This reverts commit d92ee42bf0523425b33583006fc94c787dca55cb.
- - - - -
cf53e4fd by Pier Angelo Vendrame at 2024-08-08T11:12:22+02:00
fixup! Base Browser strings
This reverts commit 900fb923a95ec97a9c843085759fa08d961bd92c.
- - - - -
4 changed files:
- browser/base/content/browser.xhtml
- − browser/base/content/droppedSupportNotification.js
- browser/base/jar.mn
- toolkit/locales/en-US/toolkit/global/base-browser.ftl
Changes:
=====================================
browser/base/content/browser.xhtml
=====================================
@@ -129,7 +129,6 @@
Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
- Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this);
window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
=====================================
browser/base/content/droppedSupportNotification.js deleted
=====================================
@@ -1,69 +0,0 @@
-"use strict";
-
-// Show a prompt that a user's system will no longer be supported.
-window.addEventListener("load", () => {
- let labelId;
- // Expire date is 2024-10-01 (1st October 2024).
- const isExpired = Date.now() > Date.UTC(2024, 9, 1);
-
- if (
- AppConstants.platform === "macosx" &&
- Services.vc.compare(
- Services.sysinfo.getProperty("version"),
- "19.0" // MacOS 10.15 begins with Darwin 19.0
- ) < 0
- ) {
- labelId = isExpired
- ? "dropped-support-notification-macos-version-less-than-10-15-expired"
- : "dropped-support-notification-macos-version-less-than-10-15";
- } else if (
- AppConstants.platform === "win" &&
- Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0
- ) {
- labelId = isExpired
- ? "dropped-support-notification-win-os-version-less-than-10-expired"
- : "dropped-support-notification-win-os-version-less-than-10";
- }
-
- const dismissedPref =
- "browser.dropped_support_notification_v14.dismiss_version";
-
- if (!labelId) {
- // Avoid setting any preferences for supported versions, and clean up any
- // old values if the user ported their profile.
- Services.prefs.clearUserPref(dismissedPref);
- return;
- }
-
- if (
- !isExpired &&
- Services.prefs.getStringPref(dismissedPref, "") ===
- AppConstants.BASE_BROWSER_VERSION
- ) {
- // Already dismissed since the last update.
- return;
- }
-
- const buttons = isExpired
- ? undefined
- : [
- {
- "l10n-id": "dropped-support-notification-dismiss-button",
- callback: () => {
- Services.prefs.setStringPref(
- dismissedPref,
- AppConstants.BASE_BROWSER_VERSION
- );
- },
- },
- ];
-
- gNotificationBox.appendNotification(
- "dropped-support-notification",
- {
- label: { "l10n-id": labelId },
- priority: gNotificationBox.PRIORITY_WARNING_HIGH,
- },
- buttons
- );
-});
=====================================
browser/base/jar.mn
=====================================
@@ -99,5 +99,4 @@ browser.jar:
content/browser/spotlight.js (content/spotlight.js)
* content/browser/default-bookmarks.html (content/default-bookmarks.html)
- content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js)
content/browser/languageNotification.js (content/languageNotification.js)
=====================================
toolkit/locales/en-US/toolkit/global/base-browser.ftl
=====================================
@@ -166,21 +166,3 @@ security-level-summary-custom = Your custom browser preferences have resulted in
# Button to undo custom changes to the security level and place the user in one of the standard security levels.
# Shown in the security level panel and settings.
security-level-restore-defaults-button = Restore defaults
-
-## Notification for dropped operating system support.
-
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "14.0" refers to the browser versions number: Tor Browser 14.0.
-# "macOS" is a brand name, and 10.15 is the macOS version number.
-dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "macOS" is a brand name, and 10.15 is the macOS version number.
-dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "14.0" refers to the browser versions number: Tor Browser 14.0.
-# "Windows" is a brand name, and "Windows 10" is the version.
-dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "Windows" is a brand name, and "Windows 10" is the version.
-dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates.
-dropped-support-notification-dismiss-button = Got it
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/65…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/65…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
be034bda by Pier Angelo Vendrame at 2024-08-08T11:06:16+02:00
fixup! Bug 42347: Add a notification for dropped OS version support.
Bug 43021: Revert "Bug 42347: Add a notification for dropped OS version support."
This reverts commit d92ee42bf0523425b33583006fc94c787dca55cb.
- - - - -
5a97c2df by Pier Angelo Vendrame at 2024-08-08T11:06:19+02:00
fixup! Base Browser strings
This reverts commit 900fb923a95ec97a9c843085759fa08d961bd92c.
- - - - -
4 changed files:
- browser/base/content/browser.xhtml
- − browser/base/content/droppedSupportNotification.js
- browser/base/jar.mn
- toolkit/locales/en-US/toolkit/global/base-browser.ftl
Changes:
=====================================
browser/base/content/browser.xhtml
=====================================
@@ -138,7 +138,6 @@
Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
- Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this);
window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
=====================================
browser/base/content/droppedSupportNotification.js deleted
=====================================
@@ -1,69 +0,0 @@
-"use strict";
-
-// Show a prompt that a user's system will no longer be supported.
-window.addEventListener("load", () => {
- let labelId;
- // Expire date is 2024-10-01 (1st October 2024).
- const isExpired = Date.now() > Date.UTC(2024, 9, 1);
-
- if (
- AppConstants.platform === "macosx" &&
- Services.vc.compare(
- Services.sysinfo.getProperty("version"),
- "19.0" // MacOS 10.15 begins with Darwin 19.0
- ) < 0
- ) {
- labelId = isExpired
- ? "dropped-support-notification-macos-version-less-than-10-15-expired"
- : "dropped-support-notification-macos-version-less-than-10-15";
- } else if (
- AppConstants.platform === "win" &&
- Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0
- ) {
- labelId = isExpired
- ? "dropped-support-notification-win-os-version-less-than-10-expired"
- : "dropped-support-notification-win-os-version-less-than-10";
- }
-
- const dismissedPref =
- "browser.dropped_support_notification_v14.dismiss_version";
-
- if (!labelId) {
- // Avoid setting any preferences for supported versions, and clean up any
- // old values if the user ported their profile.
- Services.prefs.clearUserPref(dismissedPref);
- return;
- }
-
- if (
- !isExpired &&
- Services.prefs.getStringPref(dismissedPref, "") ===
- AppConstants.BASE_BROWSER_VERSION
- ) {
- // Already dismissed since the last update.
- return;
- }
-
- const buttons = isExpired
- ? undefined
- : [
- {
- "l10n-id": "dropped-support-notification-dismiss-button",
- callback: () => {
- Services.prefs.setStringPref(
- dismissedPref,
- AppConstants.BASE_BROWSER_VERSION
- );
- },
- },
- ];
-
- gNotificationBox.appendNotification(
- "dropped-support-notification",
- {
- label: { "l10n-id": labelId },
- priority: gNotificationBox.PRIORITY_WARNING_HIGH,
- },
- buttons
- );
-});
=====================================
browser/base/jar.mn
=====================================
@@ -105,5 +105,4 @@ browser.jar:
content/browser/spotlight.js (content/spotlight.js)
* content/browser/default-bookmarks.html (content/default-bookmarks.html)
- content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js)
content/browser/languageNotification.js (content/languageNotification.js)
=====================================
toolkit/locales/en-US/toolkit/global/base-browser.ftl
=====================================
@@ -166,21 +166,3 @@ security-level-summary-custom = Your custom browser preferences have resulted in
# Button to undo custom changes to the security level and place the user in one of the standard security levels.
# Shown in the security level panel and settings.
security-level-restore-defaults-button = Restore defaults
-
-## Notification for dropped operating system support.
-
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "14.0" refers to the browser versions number: Tor Browser 14.0.
-# "macOS" is a brand name, and 10.15 is the macOS version number.
-dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "macOS" is a brand name, and 10.15 is the macOS version number.
-dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "14.0" refers to the browser versions number: Tor Browser 14.0.
-# "Windows" is a brand name, and "Windows 10" is the version.
-dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates.
-# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
-# "Windows" is a brand name, and "Windows 10" is the version.
-dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates.
-dropped-support-notification-dismiss-button = Got it
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4f0cf0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4f0cf0…
You're receiving this email because of your account on gitlab.torproject.org.