Pier Angelo Vendrame pushed to branch tor-browser-115.33.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 7e836edd by Henry Wilkes at 2026-02-24T13:33:53+00:00 fixup! Bug 43125: Extend the 13.5 EOL expiry date for tor-browser. TB 43168: Update EOL notification logic for final release. We drop the expiration date. And we update the url. We also allow the user to permanently dismiss the final notification. - - - - - d74b198e by Henry Wilkes at 2026-02-24T13:33:54+00:00 fixup! Base Browser strings TB 43168: Drop unused string. - - - - - 3f1d4f8c by Henry Wilkes at 2026-02-24T13:33:55+00:00 fixup! Tor Browser strings TB 43168: Drop unused strings. - - - - - 3 changed files: - browser/base/content/droppedSupportNotification.js - toolkit/locales/en-US/toolkit/global/base-browser.ftl - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/base/content/droppedSupportNotification.js ===================================== @@ -3,8 +3,6 @@ // Show a prompt that a user's system will no longer be supported. window.addEventListener("load", () => { let labelId; - // ESR 115 EOL pushed to 24th March 2026. - const isExpired = Date.now() > Date.UTC(2026, 2, 24); if ( AppConstants.platform === "macosx" && @@ -13,22 +11,22 @@ window.addEventListener("load", () => { "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-extended-13-5"; + labelId = + "dropped-support-notification-macos-version-less-than-10-15-expired"; } 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-extended-13-5"; + labelId = + "dropped-support-notification-win-os-version-less-than-10-expired"; } const dismissedPref = "browser.dropped_support_notification_v14.dismiss_version"; if (!labelId) { + // User has moved the application to a newer version. They should get an + // update beyond 13.5. // Avoid setting any preferences for supported versions, and clean up any // old values if the user ported their profile. Services.prefs.clearUserPref(dismissedPref); @@ -36,62 +34,30 @@ window.addEventListener("load", () => { } if ( - !isExpired && Services.prefs.getStringPref(dismissedPref, "") === - AppConstants.BASE_BROWSER_VERSION + AppConstants.BASE_BROWSER_VERSION ) { // Already dismissed since the last update. return; } - // Locales that have support pages. - // Note, these correspond to their app locale names. - const supportLocales = [ - "en-US", - "ar", - "de", - "es-ES", - "fa", - "fr", - "id", - "it", - "ko", - "pt-BR", - "ro", - "ru", - "sw", - "tr", - "uk", - "vi", - "zh-CN", - "zh-TW", - ]; - // Find the first locale that matches. - let locale = Services.locale.appLocalesAsBCP47.find(l => { - return supportLocales.includes(l); - }); - if (locale === "es-ES") { - // Support page uses "es". All other locales use the same code in Tor - // Browser as the support page. - locale = "es"; - } else if (locale === "en-US") { - // This is the default. - locale = undefined; + let locale = Services.locale.appLocaleAsBCP47; + if (locale === "ja-JP-macos") { + // Convert quirk-locale to the locale used for tor project. + locale = "ja"; } - - const link = `https://support.torproject.org/${ - locale ? `${locale}/` : "" - }tbb/tor-browser-and-legacy-os/`; + // NOTE: The support page only covers a subset of locales. But they should + // redirect to the default en-US page if the locale is not supported. + // Locales that have support pages. + // NOTE: /es-ES/ will redirect to /es/. + const link = `https://support.torproject.org/${locale}/tor-browser/security/legacy-os/`; const buttons = [ { "l10n-id": "notification-learnmore-default-label", link, }, - ]; - - if (!isExpired) { - buttons.push({ + { "l10n-id": "dropped-support-notification-dismiss-button", callback: () => { Services.prefs.setStringPref( @@ -99,8 +65,8 @@ window.addEventListener("load", () => { AppConstants.BASE_BROWSER_VERSION ); }, - }); - } + }, + ]; gNotificationBox.appendNotification( "dropped-support-notification", ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -188,18 +188,10 @@ security-level-restart-prompt-button-ignore = Ignore ## 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 ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -633,15 +633,3 @@ onion-neterror-invalid-address-description = The provided onion site address is # "Circuit" refers to a Tor network circuit. onion-neterror-timed-out-header = Onion site circuit creation timed out onion-neterror-timed-out-description = Failed to connect to the onion site, possibly due to a poor network connection. - -## Notification for dropped operating system support. - -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "13.5" refers to the browser version number. -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15-extended-13-5 = { -brand-short-name } 13.5 will only receive security updates for a limited time. Please upgrade to macOS 10.15 or later to receive the latest version of { -brand-short-name }. - -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "13.5" refers to the browser version number. -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10-extended-13-5 = { -brand-short-name } 13.5 will only receive security updates for a limited time. Please upgrade to Windows 10 or later to receive the latest version of { -brand-short-name }. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/761453a... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/761453a... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Pier Angelo Vendrame (@pierov)