[tor-commits] [Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 42347: Add a notification for dropped OS version support.
Pier Angelo Vendrame (@pierov)
git at gitlab.torproject.org
Thu Aug 8 09:17:04 UTC 2024
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/a67e45205e4d10d076706b4821a4832785ec5c82...562aeca539f95fafcba60befaaee1a4ead278dc8
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a67e45205e4d10d076706b4821a4832785ec5c82...562aeca539f95fafcba60befaaee1a4ead278dc8
You're receiving this email because of your account on gitlab.torproject.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240808/6a6eefb2/attachment-0001.htm>
More information about the tor-commits
mailing list