[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.33.0esr-13.5-1] 3 commits: fixup! Bug 43125: Extend the 13.5 EOL expiry date for tor-browser.

Title: GitLab

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:

Changes:

  • browser/base/content/droppedSupportNotification.js
    ... ... @@ -3,8 +3,6 @@
    3 3 
     // Show a prompt that a user's system will no longer be supported.
    4 4 
     window.addEventListener("load", () => {
    5 5 
       let labelId;
    6 
    -  // ESR 115 EOL pushed to 24th March 2026.
    7 
    -  const isExpired = Date.now() > Date.UTC(2026, 2, 24);
    8 6
    9 7 
       if (
    10 8 
         AppConstants.platform === "macosx" &&
    ... ... @@ -13,22 +11,22 @@ window.addEventListener("load", () => {
    13 11 
           "19.0" // MacOS 10.15 begins with Darwin 19.0
    14 12 
         ) < 0
    15 13 
       ) {
    16 
    -    labelId = isExpired
    17 
    -      ? "dropped-support-notification-macos-version-less-than-10-15-expired"
    18 
    -      : "dropped-support-notification-macos-version-less-than-10-15-extended-13-5";
    14 
    +    labelId =
    15 
    +      "dropped-support-notification-macos-version-less-than-10-15-expired";
    19 16 
       } else if (
    20 17 
         AppConstants.platform === "win" &&
    21 18 
         Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0
    22 19 
       ) {
    23 
    -    labelId = isExpired
    24 
    -      ? "dropped-support-notification-win-os-version-less-than-10-expired"
    25 
    -      : "dropped-support-notification-win-os-version-less-than-10-extended-13-5";
    20 
    +    labelId =
    21 
    +      "dropped-support-notification-win-os-version-less-than-10-expired";
    26 22 
       }
    27 23
    28 24 
       const dismissedPref =
    29 25 
         "browser.dropped_support_notification_v14.dismiss_version";
    30 26
    31 27 
       if (!labelId) {
    28 
    +    // User has moved the application to a newer version. They should get an
    29 
    +    // update beyond 13.5.
    32 30 
         // Avoid setting any preferences for supported versions, and clean up any
    33 31 
         // old values if the user ported their profile.
    34 32 
         Services.prefs.clearUserPref(dismissedPref);
    ... ... @@ -36,62 +34,30 @@ window.addEventListener("load", () => {
    36 34 
       }
    37 35
    38 36 
       if (
    39 
    -    !isExpired &&
    40 37 
         Services.prefs.getStringPref(dismissedPref, "") ===
    41 
    -      AppConstants.BASE_BROWSER_VERSION
    38 
    +    AppConstants.BASE_BROWSER_VERSION
    42 39 
       ) {
    43 40 
         // Already dismissed since the last update.
    44 41 
         return;
    45 42 
       }
    46 43
    47 
    -  // Locales that have support pages.
    48 
    -  // Note, these correspond to their app locale names.
    49 
    -  const supportLocales = [
    50 
    -    "en-US",
    51 
    -    "ar",
    52 
    -    "de",
    53 
    -    "es-ES",
    54 
    -    "fa",
    55 
    -    "fr",
    56 
    -    "id",
    57 
    -    "it",
    58 
    -    "ko",
    59 
    -    "pt-BR",
    60 
    -    "ro",
    61 
    -    "ru",
    62 
    -    "sw",
    63 
    -    "tr",
    64 
    -    "uk",
    65 
    -    "vi",
    66 
    -    "zh-CN",
    67 
    -    "zh-TW",
    68 
    -  ];
    69 
    -  // Find the first locale that matches.
    70 
    -  let locale = Services.locale.appLocalesAsBCP47.find(l => {
    71 
    -    return supportLocales.includes(l);
    72 
    -  });
    73 
    -  if (locale === "es-ES") {
    74 
    -    // Support page uses "es". All other locales use the same code in Tor
    75 
    -    // Browser as the support page.
    76 
    -    locale = "es";
    77 
    -  } else if (locale === "en-US") {
    78 
    -    // This is the default.
    79 
    -    locale = undefined;
    44 
    +  let locale = Services.locale.appLocaleAsBCP47;
    45 
    +  if (locale === "ja-JP-macos") {
    46 
    +    // Convert quirk-locale to the locale used for tor project.
    47 
    +    locale = "ja";
    80 48 
       }
    81 
    -
    82 
    -  const link = `https://support.torproject.org/${
    83 
    -    locale ? `${locale}/` : ""
    84 
    -  }tbb/tor-browser-and-legacy-os/`;
    49 
    +  // NOTE: The support page only covers a subset of locales. But they should
    50 
    +  // redirect to the default en-US page if the locale is not supported.
    51 
    +  // Locales that have support pages.
    52 
    +  // NOTE: /es-ES/ will redirect to /es/.
    53 
    +  const link = `https://support.torproject.org/${locale}/tor-browser/security/legacy-os/`;
    85 54
    86 55 
       const buttons = [
    87 56 
         {
    88 57 
           "l10n-id": "notification-learnmore-default-label",
    89 58 
           link,
    90 59 
         },
    91 
    -  ];
    92 
    -
    93 
    -  if (!isExpired) {
    94 
    -    buttons.push({
    60 
    +    {
    95 61 
           "l10n-id": "dropped-support-notification-dismiss-button",
    96 62 
           callback: () => {
    97 63 
             Services.prefs.setStringPref(
    ... ... @@ -99,8 +65,8 @@ window.addEventListener("load", () => {
    99 65 
               AppConstants.BASE_BROWSER_VERSION
    100 66 
             );
    101 67 
           },
    102 
    -    });
    103 
    -  }
    68 
    +    },
    69 
    +  ];
    104 70
    105 71 
       gNotificationBox.appendNotification(
    106 72 
         "dropped-support-notification",

  • toolkit/locales/en-US/toolkit/global/base-browser.ftl
    ... ... @@ -188,18 +188,10 @@ security-level-restart-prompt-button-ignore = Ignore
    188 188
    189 189 
     ## Notification for dropped operating system support.
    190 190
    191 
    -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    192 
    -# "14.0" refers to the browser versions number: Tor Browser 14.0.
    193 
    -# "macOS" is a brand name, and 10.15 is the macOS version number.
    194 
    -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.
    195 191 
     # "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    196 192 
     # "macOS" is a brand name, and 10.15 is the macOS version number.
    197 193 
     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.
    198 194 
     # "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    199 
    -# "14.0" refers to the browser versions number: Tor Browser 14.0.
    200 
    -# "Windows" is a brand name, and "Windows 10" is the version.
    201 
    -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.
    202 
    -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    203 195 
     # "Windows" is a brand name, and "Windows 10" is the version.
    204 196 
     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.
    205 197 
     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
    633 633 
     # "Circuit" refers to a Tor network circuit.
    634 634 
     onion-neterror-timed-out-header = Onion site circuit creation timed out
    635 635 
     onion-neterror-timed-out-description = Failed to connect to the onion site, possibly due to a poor network connection.
    636 
    -
    637 
    -## Notification for dropped operating system support.
    638 
    -
    639 
    -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    640 
    -# "13.5" refers to the browser version number.
    641 
    -# "macOS" is a brand name, and 10.15 is the macOS version number.
    642 
    -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 }.
    643 
    -
    644 
    -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
    645 
    -# "13.5" refers to the browser version number.
    646 
    -# "Windows" is a brand name, and "Windows 10" is the version.
    647 
    -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.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/761453a45da962ce5d9b41c2b0125d682a6e9734...3f1d4f8c73738d3fe0d1373f02bd1fc1ae7fdd7f at 1771941860 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx