commit 53772e4cc4022d2cbeb4ba5427c8117010227805
parent 72fc2f83fe2979b1a7b0f1552555d77b63bbf891
Author: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 31 Oct 2025 23:08:58 +0000
Bug 1970743 - move strings for browser-utils to the right file, r=fluent-reviewers,bolsson
Differential Revision: https://phabricator.services.mozilla.com/D269274
Diffstat:
5 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/python/l10n/fluent_migrations/bug_1970743_browser_utils.py b/python/l10n/fluent_migrations/bug_1970743_browser_utils.py
@@ -0,0 +1,26 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+import fluent.syntax.ast as FTL
+from fluent.migrate import COPY_PATTERN
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate.transforms import COPY
+
+
+def migrate(ctx):
+ """Bug 1970743 - move some download strings to browser-utils.ftl, part {index}."""
+ source = "toolkit/toolkit/downloads/downloadUtils.ftl"
+ target = "toolkit/toolkit/global/browser-utils.ftl"
+
+ ctx.add_transforms(
+ target,
+ target,
+ transforms_from(
+ """
+browser-utils-file-scheme = {COPY_PATTERN(from_path, "download-utils-done-file-scheme")}
+
+browser-utils-url-scheme = {COPY_PATTERN(from_path, "download-utils-done-scheme")}
+""",
+ from_path=source,
+ ),
+ )
diff --git a/toolkit/locales/en-US/toolkit/downloads/downloadUtils.ftl b/toolkit/locales/en-US/toolkit/downloads/downloadUtils.ftl
@@ -95,12 +95,5 @@ download-utils-time-left-double = { $time1 } { $time2 } left
download-utils-time-few-seconds = A few seconds left
download-utils-time-unknown = Unknown time left
-# Variables:
-# $scheme (string) - URI scheme like data: jar: about:
-download-utils-done-scheme = { $scheme } resource
-# Special case of done-scheme for file:
-# This is used as an eTLD replacement for local files, so make it lower case
-download-utils-done-file-scheme = local file
-
# Displayed time for files finished yesterday
download-utils-yesterday = Yesterday
diff --git a/toolkit/locales/en-US/toolkit/global/browser-utils.ftl b/toolkit/locales/en-US/toolkit/global/browser-utils.ftl
@@ -5,6 +5,14 @@
# Used for data: URLs where we don't have any useful origin information
browser-utils-url-data = (data)
+# Variables:
+# $scheme (string) - URI scheme like jar: about:
+browser-utils-url-scheme = { $scheme } resource
+# Special case of done-scheme for file:
+# This is used as an eTLD replacement for local files, so make it lower case
+browser-utils-file-scheme = local file
+
+
# Used for extension URLs
# Variables:
# $extension (string) - Name of the extension that generated the URL
diff --git a/toolkit/modules/BrowserUtils.sys.mjs b/toolkit/modules/BrowserUtils.sys.mjs
@@ -91,10 +91,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
);
ChromeUtils.defineLazyGetter(lazy, "gLocalization", () => {
- return new Localization(
- ["toolkit/global/browser-utils.ftl", "toolkit/downloads/downloadUtils.ftl"],
- true
- );
+ return new Localization(["toolkit/global/browser-utils.ftl"], true);
});
function stringPrefToSet(prefVal) {
@@ -335,11 +332,11 @@ export var BrowserUtils = {
if (!showFilenameForLocalURIs) {
if (uri.scheme == "file") {
return lazy.gLocalization.formatValueSync(
- "download-utils-done-file-scheme"
+ "browser-utils-file-scheme"
);
}
return lazy.gLocalization.formatValueSync(
- "download-utils-done-scheme",
+ "browser-utils-url-scheme",
{ scheme: uri.scheme }
);
}
diff --git a/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js b/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
@@ -9,10 +9,7 @@ let tempFile = new FileUtils.File(PathUtils.tempDir);
const TEST_LOCAL_FILE_NAME = "hello.txt";
tempFile.append(TEST_LOCAL_FILE_NAME);
-const gL10n = new Localization(
- ["toolkit/global/browser-utils.ftl", "toolkit/downloads/downloadUtils.ftl"],
- true
-);
+const gL10n = new Localization(["toolkit/global/browser-utils.ftl"], true);
const DATA_URL_EXPECTED_STRING = gL10n.formatValueSync(
"browser-utils-url-data"
);
@@ -23,7 +20,7 @@ const EXTENSION_URL_EXPECTED_STRING = gL10n.formatValueSync(
);
const FILE_URL_EXPECTED_STRING = gL10n.formatValueSync(
- "download-utils-done-file-scheme"
+ "browser-utils-file-scheme"
);
const { AddonTestUtils } = ChromeUtils.importESModule(
