tor-browser

commit 898a38978a9b4f20082a5b1701aad864b92129b5
parent 39f6e8cde4afe0fc00bc4db8f19e8445b492f454
Author: Rob Wu <rob@robwu.nl>
Date:   Mon, 20 Oct 2025 14:12:24 +0000

Bug 1727828 - Change "safe mode" to "Troubleshoot mode" in about:addons r=rpl,fluent-reviewers,bolsson

Differential Revision: https://phabricator.services.mozilla.com/D268459

Diffstat:
M
toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
 | 
4
++--
M
toolkit/mozapps/extensions/content/aboutaddons.js
 | 
2
+-
M
toolkit/mozapps/extensions/test/browser/browser_AMBrowserExtensionsImport.js
 | 
36
++++++++++++++++++++++++------------
M
toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
 | 
5
+++++

4 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
@@ -206,8 +206,8 @@ addon-sitepermission-host = Site Permissions for { $host }
 
 ## These are global warnings
 
-extensions-warning-safe-mode2 =
-    .message = All add-ons have been disabled by safe mode.
+extensions-warning-safe-mode3 =
+    .message = All add-ons have been disabled by Troubleshoot Mode.
 extensions-warning-check-compatibility2 =
     .message = Add-on compatibility checking is disabled. You may have incompatible add-ons.
 extensions-warning-check-compatibility-button = Enable
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -831,7 +831,7 @@ class GlobalWarnings extends MessageBarStackElement {
   getGlobalWarningL10nIds(type) {
     const WARNING_TYPE_TO_L10NID_MAPPING = {
       "safe-mode": {
-        messageId: "extensions-warning-safe-mode2",
+        messageId: "extensions-warning-safe-mode3",
       },
       "update-security": {
         messageId: "extensions-warning-update-security2",
diff --git a/toolkit/mozapps/extensions/test/browser/browser_AMBrowserExtensionsImport.js b/toolkit/mozapps/extensions/test/browser/browser_AMBrowserExtensionsImport.js
@@ -53,11 +53,18 @@ const mockAddonRepository = ({ addons = [] }) => {
   };
 };
 
+// All message bars (except for imported-addons) are already checked in
+// toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
+// This test serves as a sanity check that the other message bars still behave
+// as expected when the imported-addons messagebar is shown.
 const assertWarningShown = async (
   win,
   stack,
-  expectedWarningType = "imported-addons",
-  expectAction = true
+  {
+    expectedWarningType = "imported-addons",
+    expectedWarningL10nId,
+    expectAction = true,
+  } = {}
 ) => {
   Assert.equal(stack.childElementCount, 1, "expected a global warning");
   const messageBar = stack.firstElementChild;
@@ -68,7 +75,7 @@ const assertWarningShown = async (
   );
   Assert.equal(
     messageBar.getAttribute("data-l10n-id"),
-    `extensions-warning-${expectedWarningType}2`,
+    expectedWarningL10nId || `extensions-warning-${expectedWarningType}2`,
     "expected correct l10n ID"
   );
   await win.document.l10n.translateElements([messageBar]);
@@ -160,12 +167,11 @@ add_task(async function test_aboutaddons_global_message() {
   info("Verify safe-mode is not hidden by an imported-addons messagebar");
   stack.inSafeMode = true;
   stack.refresh();
-  await assertWarningShown(
-    win,
-    stack,
-    "safe-mode",
-    false /* no button expected */
-  );
+  await assertWarningShown(win, stack, {
+    expectedWarningType: "safe-mode",
+    expectedWarningL10nId: "extensions-warning-safe-mode3",
+    expectAction: false,
+  });
   stack.inSafeMode = false;
 
   info(
@@ -173,7 +179,9 @@ add_task(async function test_aboutaddons_global_message() {
   );
   AddonManager.checkCompatibility = false;
   stack.refresh();
-  await assertWarningShown(win, stack, "check-compatibility");
+  await assertWarningShown(win, stack, {
+    expectedWarningType: "check-compatibility",
+  });
   AddonManager.checkCompatibility = true;
 
   info("Verify update-security is not hidden by an imported-addons messagebar");
@@ -181,7 +189,9 @@ add_task(async function test_aboutaddons_global_message() {
     set: [["extensions.checkUpdateSecurity", false]],
   });
   stack.refresh();
-  await assertWarningShown(win, stack, "update-security");
+  await assertWarningShown(win, stack, {
+    expectedWarningType: "update-security",
+  });
   await SpecialPowers.popPrefEnv();
 
   // After making sure the imported-addons messagebar is visible again, we
@@ -190,7 +200,9 @@ add_task(async function test_aboutaddons_global_message() {
     "Verify pending imported addons can be completed from the messagebar action"
   );
   stack.refresh();
-  await assertWarningShown(win, stack, "imported-addons");
+  await assertWarningShown(win, stack, {
+    expectedWarningType: "imported-addons",
+  });
 
   // Complete the installation of the add-ons by clicking on the button in the
   // global warning.
diff --git a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
@@ -28,6 +28,11 @@ function checkMessageShown(win, type, hasButton) {
   );
   is_element_visible(messageBar, "Message bar is visible");
   is(messageBar.getAttribute("warning-type"), type);
+  if (type == "safe-mode") {
+    is(messageBar.dataset.l10nId, "extensions-warning-safe-mode3");
+  } else {
+    is(messageBar.dataset.l10nId, `extensions-warning-${type}2`);
+  }
   if (hasButton) {
     let button = messageBar.querySelector("button");
     is_element_visible(button, "Button is visible");