morgan pushed to branch tor-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Tor Browser

Commits: edd22eaa by Henry Wilkes at 2024-09-24T13:21:35+01:00 Bug 43125: Extend the 13.5 EOL expiry date for tor-browser.

- - - - - 87528dc0 by Henry Wilkes at 2024-09-24T13:21:36+01:00 fixup! Tor Browser strings

Bug 43125: Add an end of life message for tor-browser only.

- - - - -

2 changed files:

- browser/base/content/droppedSupportNotification.js - toolkit/locales/en-US/toolkit/global/tor-browser.ftl

Changes:

===================================== browser/base/content/droppedSupportNotification.js ===================================== @@ -3,8 +3,8 @@ // 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); + // Firefox moved ESR 115 EOL to 1st April 2025. + const isExpired = Date.now() > Date.UTC(2025, 3, 1);

if ( AppConstants.platform === "macosx" && @@ -15,14 +15,14 @@ window.addEventListener("load", () => { ) { labelId = isExpired ? "dropped-support-notification-macos-version-less-than-10-15-expired" - : "dropped-support-notification-macos-version-less-than-10-15"; + : "dropped-support-notification-macos-version-less-than-10-15-extended-13-5"; } 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"; + : "dropped-support-notification-win-os-version-less-than-10-extended-13-5"; }

const dismissedPref = @@ -44,19 +44,63 @@ window.addEventListener("load", () => { return; }

- const buttons = isExpired - ? undefined - : [ - { - "l10n-id": "dropped-support-notification-dismiss-button", - callback: () => { - Services.prefs.setStringPref( - dismissedPref, - AppConstants.BASE_BROWSER_VERSION - ); - }, - }, - ]; + // 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; + } + + const link = `https://support.torproject.org/$%7B + locale ? `${locale}/` : "" + }tbb/tor-browser-and-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( + dismissedPref, + AppConstants.BASE_BROWSER_VERSION + ); + }, + }); + }

gNotificationBox.appendNotification( "dropped-support-notification",

===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -633,3 +633,15 @@ 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/c5402ad...