diff --git a/.clang-format-ignore b/.clang-format-ignore index 83276e002601..9ffc9a09e9da 100644 --- a/.clang-format-ignore +++ b/.clang-format-ignore @@ -202,7 +202,7 @@ testing/web-platform/tests/tools/third_party/.* third_party/.* toolkit/components/jsoncpp/.* toolkit/components/protobuf/.* -toolkit/components/translation/cld2/.* +toolkit/components/translations/cld2/.* toolkit/components/url-classifier/chromium/.* toolkit/components/url-classifier/protobuf/.* toolkit/crashreporter/breakpad-client/.* diff --git a/.eslintrc-ignores.js b/.eslintrc-ignores.js index c437e217fab3..0394a4bd3922 100644 --- a/.eslintrc-ignores.js +++ b/.eslintrc-ignores.js @@ -277,7 +277,7 @@ module.exports = [ "toolkit/components/reader/Readerable.sys.mjs", // Generated & special files in cld2 - "toolkit/components/translation/cld2/", + "toolkit/components/translations/cld2/", // Uses preprocessing "toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js", diff --git a/.eslintrc-rollouts.js b/.eslintrc-rollouts.js index 3669e71ae130..a762b571c8ff 100644 --- a/.eslintrc-rollouts.js +++ b/.eslintrc-rollouts.js @@ -387,7 +387,6 @@ const rollouts = [ "toolkit/components/telemetry/**", "toolkit/components/thumbnails/**", "toolkit/components/timermanager/UpdateTimerManager.*", - "toolkit/components/translation/LanguageDetector.*", "toolkit/components/url-classifier/**", "toolkit/components/utils/**", "toolkit/components/viewsource/**", @@ -550,7 +549,6 @@ const rollouts = [ "toolkit/components/telemetry/**", "toolkit/components/thumbnails/**", "toolkit/components/timermanager/UpdateTimerManager.*", - "toolkit/components/translation/LanguageDetector.*", "toolkit/components/translations/**", "toolkit/components/uniffi-bindgen-gecko-js/fixtures/tests/xpcshell/test_callbacks.js", "toolkit/components/uniffi-js/js/UniFFI.sys.mjs", diff --git a/.prettierignore b/.prettierignore index b099c7cbd301..35ceffdfb352 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1213,7 +1213,7 @@ toolkit/components/pdfjs/content/web toolkit/components/reader/Readerable.sys.mjs # Generated & special files in cld2 -toolkit/components/translation/cld2/ +toolkit/components/translations/cld2/ # Uses preprocessing toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js @@ -1433,7 +1433,7 @@ toolkit/components/passwordmgr/shared/PasswordRulesParser.sys.mjs toolkit/components/protobuf/ toolkit/components/reader/readability/ toolkit/components/resistfingerprinting/content/gl-matrix.js -toolkit/components/translation/cld2/ +toolkit/components/translations/cld2/ toolkit/components/translations/bergamot-translator/thirdparty toolkit/components/translations/bergamot-translator/bergamot-translator.js toolkit/components/url-classifier/chromium/ diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js index 3a9f858b2f41..bb5985c3f014 100644 --- a/browser/base/content/test/performance/browser_startup_content.js +++ b/browser/base/content/test/performance/browser_startup_content.js @@ -65,7 +65,7 @@ const intermittently_loaded_scripts = { // Translations code which may be preffed on. "resource://gre/actors/TranslationsChild.sys.mjs", - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", "resource://gre/modules/ConsoleAPIStorage.sys.mjs", // Logging related. // Session store. diff --git a/browser/components/translations/content/selectTranslationsPanel.js b/browser/components/translations/content/selectTranslationsPanel.js index 2cee4ba91a9c..b4023c8ab37a 100644 --- a/browser/components/translations/content/selectTranslationsPanel.js +++ b/browser/components/translations/content/selectTranslationsPanel.js @@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, { LanguageDetector: - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", TranslationsPanelShared: "chrome://browser/content/translations/TranslationsPanelShared.sys.mjs", TranslationsUtils: diff --git a/dom/security/nsContentSecurityUtils.cpp b/dom/security/nsContentSecurityUtils.cpp index cb005c8ae05b..b77e27d799ba 100644 --- a/dom/security/nsContentSecurityUtils.cpp +++ b/dom/security/nsContentSecurityUtils.cpp @@ -606,7 +606,7 @@ bool nsContentSecurityUtils::IsEvalAllowed(JSContext* cx, "resource://testing-common/content-task.js"_ns, // Tracked by Bug 1584605 - "resource://gre/modules/translation/cld-worker.js"_ns, + "resource://gre/modules/translations/cld-worker.js"_ns, // require.js implements a script loader for workers. It uses eval // to load the script; but injection is only possible in situations diff --git a/mots.yaml b/mots.yaml index c5055734be64..f6005bf2253b 100644 --- a/mots.yaml +++ b/mots.yaml @@ -4495,7 +4495,6 @@ modules: new translation language models. includes: - toolkit/components/translations/**/* - - toolkit/components/translation/**/* - browser/components/translations/**/* excludes: [] owners: diff --git a/toolkit/components/extensions/ExtensionContent.sys.mjs b/toolkit/components/extensions/ExtensionContent.sys.mjs index 52f97bedd495..c21cfc1810ab 100644 --- a/toolkit/components/extensions/ExtensionContent.sys.mjs +++ b/toolkit/components/extensions/ExtensionContent.sys.mjs @@ -17,7 +17,7 @@ ChromeUtils.defineESModuleGetters(lazy, { ExtensionUserScriptsContent: "resource://gre/modules/ExtensionUserScriptsContent.sys.mjs", LanguageDetector: - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", Schemas: "resource://gre/modules/Schemas.sys.mjs", WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.sys.mjs", }); diff --git a/toolkit/components/extensions/parent/ext-i18n.js b/toolkit/components/extensions/parent/ext-i18n.js index 167a1d16c255..48a77cb752b2 100644 --- a/toolkit/components/extensions/parent/ext-i18n.js +++ b/toolkit/components/extensions/parent/ext-i18n.js @@ -6,7 +6,7 @@ ChromeUtils.defineESModuleGetters(this, { LanguageDetector: - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", }); this.i18n = class extends ExtensionAPI { diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index 9ced14334cdb..24291461548e 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -76,7 +76,6 @@ DIRS += [ "startup", "statusfilter", "telemetry", - "translation", "translations", "thumbnails", "timermanager", diff --git a/toolkit/components/reader/ReaderMode.sys.mjs b/toolkit/components/reader/ReaderMode.sys.mjs index e69d18161b25..112adb9b646a 100644 --- a/toolkit/components/reader/ReaderMode.sys.mjs +++ b/toolkit/components/reader/ReaderMode.sys.mjs @@ -34,7 +34,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { LanguageDetector: - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", ReaderWorker: "resource://gre/modules/reader/ReaderWorker.sys.mjs", Readerable: "resource://gre/modules/Readerable.sys.mjs", }); diff --git a/toolkit/components/translation/moz.build b/toolkit/components/translation/moz.build deleted file mode 100644 index 38214a2dc18d..000000000000 --- a/toolkit/components/translation/moz.build +++ /dev/null @@ -1,14 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -with Files("**"): - BUG_COMPONENT = ("Firefox", "Translations") - -EXTRA_JS_MODULES.translation = [ - "cld2/cld-worker.js", - "cld2/cld-worker.js.mem", - "LanguageDetector.sys.mjs", -] - -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"] diff --git a/toolkit/components/translation/LanguageDetector.sys.mjs b/toolkit/components/translations/LanguageDetector.sys.mjs similarity index 100% rename from toolkit/components/translation/LanguageDetector.sys.mjs rename to toolkit/components/translations/LanguageDetector.sys.mjs diff --git a/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs b/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs index 3037f89a98ec..4320962ecf57 100644 --- a/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs +++ b/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs @@ -13,7 +13,7 @@ ChromeUtils.defineLazyGetter(lazy, "console", () => { ChromeUtils.defineESModuleGetters(lazy, { LanguageDetector: - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", }); /** diff --git a/toolkit/components/translations/actors/TranslationsChild.sys.mjs b/toolkit/components/translations/actors/TranslationsChild.sys.mjs index 880489ddc0d3..cf6f39d1c1b1 100644 --- a/toolkit/components/translations/actors/TranslationsChild.sys.mjs +++ b/toolkit/components/translations/actors/TranslationsChild.sys.mjs @@ -9,7 +9,7 @@ ChromeUtils.defineESModuleGetters(lazy, { LRUCache: "chrome://global/content/translations/translations-document.sys.mjs", LanguageDetector: - "resource://gre/modules/translation/LanguageDetector.sys.mjs", + "resource://gre/modules/translations/LanguageDetector.sys.mjs", }); /** diff --git a/toolkit/components/translation/cld2/LICENSE b/toolkit/components/translations/cld2/LICENSE similarity index 100% rename from toolkit/components/translation/cld2/LICENSE rename to toolkit/components/translations/cld2/LICENSE diff --git a/toolkit/components/translation/cld2/Makefile b/toolkit/components/translations/cld2/Makefile similarity index 100% rename from toolkit/components/translation/cld2/Makefile rename to toolkit/components/translations/cld2/Makefile diff --git a/toolkit/components/translation/cld2/cld-worker.js b/toolkit/components/translations/cld2/cld-worker.js similarity index 100% rename from toolkit/components/translation/cld2/cld-worker.js rename to toolkit/components/translations/cld2/cld-worker.js diff --git a/toolkit/components/translation/cld2/cld-worker.js.mem b/toolkit/components/translations/cld2/cld-worker.js.mem similarity index 100% rename from toolkit/components/translation/cld2/cld-worker.js.mem rename to toolkit/components/translations/cld2/cld-worker.js.mem diff --git a/toolkit/components/translation/cld2/cld.idl b/toolkit/components/translations/cld2/cld.idl similarity index 100% rename from toolkit/components/translation/cld2/cld.idl rename to toolkit/components/translations/cld2/cld.idl diff --git a/toolkit/components/translation/cld2/cldapp.cc b/toolkit/components/translations/cld2/cldapp.cc similarity index 100% rename from toolkit/components/translation/cld2/cldapp.cc rename to toolkit/components/translations/cld2/cldapp.cc diff --git a/toolkit/components/translation/cld2/internal/LICENSE b/toolkit/components/translations/cld2/internal/LICENSE similarity index 100% rename from toolkit/components/translation/cld2/internal/LICENSE rename to toolkit/components/translations/cld2/internal/LICENSE diff --git a/toolkit/components/translation/cld2/internal/cld2_dynamic_data.h b/toolkit/components/translations/cld2/internal/cld2_dynamic_data.h similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2_dynamic_data.h rename to toolkit/components/translations/cld2/internal/cld2_dynamic_data.h diff --git a/toolkit/components/translation/cld2/internal/cld2_dynamic_data_loader.h b/toolkit/components/translations/cld2/internal/cld2_dynamic_data_loader.h similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2_dynamic_data_loader.h rename to toolkit/components/translations/cld2/internal/cld2_dynamic_data_loader.h diff --git a/toolkit/components/translation/cld2/internal/cld2_generated_cjk_compatible.cc b/toolkit/components/translations/cld2/internal/cld2_generated_cjk_compatible.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2_generated_cjk_compatible.cc rename to toolkit/components/translations/cld2/internal/cld2_generated_cjk_compatible.cc diff --git a/toolkit/components/translation/cld2/internal/cld2_generated_deltaoctachrome0122.cc b/toolkit/components/translations/cld2/internal/cld2_generated_deltaoctachrome0122.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2_generated_deltaoctachrome0122.cc rename to toolkit/components/translations/cld2/internal/cld2_generated_deltaoctachrome0122.cc diff --git a/toolkit/components/translation/cld2/internal/cld2_generated_distinctoctachrome0122.cc b/toolkit/components/translations/cld2/internal/cld2_generated_distinctoctachrome0122.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2_generated_distinctoctachrome0122.cc rename to toolkit/components/translations/cld2/internal/cld2_generated_distinctoctachrome0122.cc diff --git a/toolkit/components/translation/cld2/internal/cld2_generated_quadchrome0122_16.cc b/toolkit/components/translations/cld2/internal/cld2_generated_quadchrome0122_16.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2_generated_quadchrome0122_16.cc rename to toolkit/components/translations/cld2/internal/cld2_generated_quadchrome0122_16.cc diff --git a/toolkit/components/translation/cld2/internal/cld2tablesummary.h b/toolkit/components/translations/cld2/internal/cld2tablesummary.h similarity index 100% rename from toolkit/components/translation/cld2/internal/cld2tablesummary.h rename to toolkit/components/translations/cld2/internal/cld2tablesummary.h diff --git a/toolkit/components/translation/cld2/internal/cld_generated_cjk_delta_bi_4.cc b/toolkit/components/translations/cld2/internal/cld_generated_cjk_delta_bi_4.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld_generated_cjk_delta_bi_4.cc rename to toolkit/components/translations/cld2/internal/cld_generated_cjk_delta_bi_4.cc diff --git a/toolkit/components/translation/cld2/internal/cld_generated_cjk_uni_prop_80.cc b/toolkit/components/translations/cld2/internal/cld_generated_cjk_uni_prop_80.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld_generated_cjk_uni_prop_80.cc rename to toolkit/components/translations/cld2/internal/cld_generated_cjk_uni_prop_80.cc diff --git a/toolkit/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc b/toolkit/components/translations/cld2/internal/cld_generated_score_quad_octa_0122_2.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cld_generated_score_quad_octa_0122_2.cc rename to toolkit/components/translations/cld2/internal/cld_generated_score_quad_octa_0122_2.cc diff --git a/toolkit/components/translation/cld2/internal/cldutil.cc b/toolkit/components/translations/cld2/internal/cldutil.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cldutil.cc rename to toolkit/components/translations/cld2/internal/cldutil.cc diff --git a/toolkit/components/translation/cld2/internal/cldutil.h b/toolkit/components/translations/cld2/internal/cldutil.h similarity index 100% rename from toolkit/components/translation/cld2/internal/cldutil.h rename to toolkit/components/translations/cld2/internal/cldutil.h diff --git a/toolkit/components/translation/cld2/internal/cldutil_shared.cc b/toolkit/components/translations/cld2/internal/cldutil_shared.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/cldutil_shared.cc rename to toolkit/components/translations/cld2/internal/cldutil_shared.cc diff --git a/toolkit/components/translation/cld2/internal/cldutil_shared.h b/toolkit/components/translations/cld2/internal/cldutil_shared.h similarity index 100% rename from toolkit/components/translation/cld2/internal/cldutil_shared.h rename to toolkit/components/translations/cld2/internal/cldutil_shared.h diff --git a/toolkit/components/translation/cld2/internal/compact_lang_det.cc b/toolkit/components/translations/cld2/internal/compact_lang_det.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/compact_lang_det.cc rename to toolkit/components/translations/cld2/internal/compact_lang_det.cc diff --git a/toolkit/components/translation/cld2/internal/compact_lang_det_hint_code.cc b/toolkit/components/translations/cld2/internal/compact_lang_det_hint_code.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/compact_lang_det_hint_code.cc rename to toolkit/components/translations/cld2/internal/compact_lang_det_hint_code.cc diff --git a/toolkit/components/translation/cld2/internal/compact_lang_det_hint_code.h b/toolkit/components/translations/cld2/internal/compact_lang_det_hint_code.h similarity index 100% rename from toolkit/components/translation/cld2/internal/compact_lang_det_hint_code.h rename to toolkit/components/translations/cld2/internal/compact_lang_det_hint_code.h diff --git a/toolkit/components/translation/cld2/internal/compact_lang_det_impl.cc b/toolkit/components/translations/cld2/internal/compact_lang_det_impl.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/compact_lang_det_impl.cc rename to toolkit/components/translations/cld2/internal/compact_lang_det_impl.cc diff --git a/toolkit/components/translation/cld2/internal/compact_lang_det_impl.h b/toolkit/components/translations/cld2/internal/compact_lang_det_impl.h similarity index 100% rename from toolkit/components/translation/cld2/internal/compact_lang_det_impl.h rename to toolkit/components/translations/cld2/internal/compact_lang_det_impl.h diff --git a/toolkit/components/translation/cld2/internal/debug.h b/toolkit/components/translations/cld2/internal/debug.h similarity index 100% rename from toolkit/components/translation/cld2/internal/debug.h rename to toolkit/components/translations/cld2/internal/debug.h diff --git a/toolkit/components/translation/cld2/internal/debug_empty.cc b/toolkit/components/translations/cld2/internal/debug_empty.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/debug_empty.cc rename to toolkit/components/translations/cld2/internal/debug_empty.cc diff --git a/toolkit/components/translation/cld2/internal/fixunicodevalue.cc b/toolkit/components/translations/cld2/internal/fixunicodevalue.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/fixunicodevalue.cc rename to toolkit/components/translations/cld2/internal/fixunicodevalue.cc diff --git a/toolkit/components/translation/cld2/internal/fixunicodevalue.h b/toolkit/components/translations/cld2/internal/fixunicodevalue.h similarity index 100% rename from toolkit/components/translation/cld2/internal/fixunicodevalue.h rename to toolkit/components/translations/cld2/internal/fixunicodevalue.h diff --git a/toolkit/components/translation/cld2/internal/generated_distinct_bi_0.cc b/toolkit/components/translations/cld2/internal/generated_distinct_bi_0.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/generated_distinct_bi_0.cc rename to toolkit/components/translations/cld2/internal/generated_distinct_bi_0.cc diff --git a/toolkit/components/translation/cld2/internal/generated_entities.cc b/toolkit/components/translations/cld2/internal/generated_entities.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/generated_entities.cc rename to toolkit/components/translations/cld2/internal/generated_entities.cc diff --git a/toolkit/components/translation/cld2/internal/generated_language.cc b/toolkit/components/translations/cld2/internal/generated_language.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/generated_language.cc rename to toolkit/components/translations/cld2/internal/generated_language.cc diff --git a/toolkit/components/translation/cld2/internal/generated_language.h b/toolkit/components/translations/cld2/internal/generated_language.h similarity index 100% rename from toolkit/components/translation/cld2/internal/generated_language.h rename to toolkit/components/translations/cld2/internal/generated_language.h diff --git a/toolkit/components/translation/cld2/internal/generated_ulscript.cc b/toolkit/components/translations/cld2/internal/generated_ulscript.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/generated_ulscript.cc rename to toolkit/components/translations/cld2/internal/generated_ulscript.cc diff --git a/toolkit/components/translation/cld2/internal/generated_ulscript.h b/toolkit/components/translations/cld2/internal/generated_ulscript.h similarity index 100% rename from toolkit/components/translation/cld2/internal/generated_ulscript.h rename to toolkit/components/translations/cld2/internal/generated_ulscript.h diff --git a/toolkit/components/translation/cld2/internal/getonescriptspan.cc b/toolkit/components/translations/cld2/internal/getonescriptspan.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/getonescriptspan.cc rename to toolkit/components/translations/cld2/internal/getonescriptspan.cc diff --git a/toolkit/components/translation/cld2/internal/getonescriptspan.h b/toolkit/components/translations/cld2/internal/getonescriptspan.h similarity index 100% rename from toolkit/components/translation/cld2/internal/getonescriptspan.h rename to toolkit/components/translations/cld2/internal/getonescriptspan.h diff --git a/toolkit/components/translation/cld2/internal/integral_types.h b/toolkit/components/translations/cld2/internal/integral_types.h similarity index 100% rename from toolkit/components/translation/cld2/internal/integral_types.h rename to toolkit/components/translations/cld2/internal/integral_types.h diff --git a/toolkit/components/translation/cld2/internal/lang_script.cc b/toolkit/components/translations/cld2/internal/lang_script.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/lang_script.cc rename to toolkit/components/translations/cld2/internal/lang_script.cc diff --git a/toolkit/components/translation/cld2/internal/lang_script.h b/toolkit/components/translations/cld2/internal/lang_script.h similarity index 100% rename from toolkit/components/translation/cld2/internal/lang_script.h rename to toolkit/components/translations/cld2/internal/lang_script.h diff --git a/toolkit/components/translation/cld2/internal/langspan.h b/toolkit/components/translations/cld2/internal/langspan.h similarity index 100% rename from toolkit/components/translation/cld2/internal/langspan.h rename to toolkit/components/translations/cld2/internal/langspan.h diff --git a/toolkit/components/translation/cld2/internal/offsetmap.cc b/toolkit/components/translations/cld2/internal/offsetmap.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/offsetmap.cc rename to toolkit/components/translations/cld2/internal/offsetmap.cc diff --git a/toolkit/components/translation/cld2/internal/offsetmap.h b/toolkit/components/translations/cld2/internal/offsetmap.h similarity index 100% rename from toolkit/components/translation/cld2/internal/offsetmap.h rename to toolkit/components/translations/cld2/internal/offsetmap.h diff --git a/toolkit/components/translation/cld2/internal/port.h b/toolkit/components/translations/cld2/internal/port.h similarity index 100% rename from toolkit/components/translation/cld2/internal/port.h rename to toolkit/components/translations/cld2/internal/port.h diff --git a/toolkit/components/translation/cld2/internal/scoreonescriptspan.cc b/toolkit/components/translations/cld2/internal/scoreonescriptspan.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/scoreonescriptspan.cc rename to toolkit/components/translations/cld2/internal/scoreonescriptspan.cc diff --git a/toolkit/components/translation/cld2/internal/scoreonescriptspan.h b/toolkit/components/translations/cld2/internal/scoreonescriptspan.h similarity index 100% rename from toolkit/components/translation/cld2/internal/scoreonescriptspan.h rename to toolkit/components/translations/cld2/internal/scoreonescriptspan.h diff --git a/toolkit/components/translation/cld2/internal/stringpiece.h b/toolkit/components/translations/cld2/internal/stringpiece.h similarity index 100% rename from toolkit/components/translation/cld2/internal/stringpiece.h rename to toolkit/components/translations/cld2/internal/stringpiece.h diff --git a/toolkit/components/translation/cld2/internal/tote.cc b/toolkit/components/translations/cld2/internal/tote.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/tote.cc rename to toolkit/components/translations/cld2/internal/tote.cc diff --git a/toolkit/components/translation/cld2/internal/tote.h b/toolkit/components/translations/cld2/internal/tote.h similarity index 100% rename from toolkit/components/translation/cld2/internal/tote.h rename to toolkit/components/translations/cld2/internal/tote.h diff --git a/toolkit/components/translation/cld2/internal/utf8prop_lettermarkscriptnum.h b/toolkit/components/translations/cld2/internal/utf8prop_lettermarkscriptnum.h similarity index 100% rename from toolkit/components/translation/cld2/internal/utf8prop_lettermarkscriptnum.h rename to toolkit/components/translations/cld2/internal/utf8prop_lettermarkscriptnum.h diff --git a/toolkit/components/translation/cld2/internal/utf8repl_lettermarklower.h b/toolkit/components/translations/cld2/internal/utf8repl_lettermarklower.h similarity index 100% rename from toolkit/components/translation/cld2/internal/utf8repl_lettermarklower.h rename to toolkit/components/translations/cld2/internal/utf8repl_lettermarklower.h diff --git a/toolkit/components/translation/cld2/internal/utf8scannot_lettermarkspecial.h b/toolkit/components/translations/cld2/internal/utf8scannot_lettermarkspecial.h similarity index 100% rename from toolkit/components/translation/cld2/internal/utf8scannot_lettermarkspecial.h rename to toolkit/components/translations/cld2/internal/utf8scannot_lettermarkspecial.h diff --git a/toolkit/components/translation/cld2/internal/utf8statetable.cc b/toolkit/components/translations/cld2/internal/utf8statetable.cc similarity index 100% rename from toolkit/components/translation/cld2/internal/utf8statetable.cc rename to toolkit/components/translations/cld2/internal/utf8statetable.cc diff --git a/toolkit/components/translation/cld2/internal/utf8statetable.h b/toolkit/components/translations/cld2/internal/utf8statetable.h similarity index 100% rename from toolkit/components/translation/cld2/internal/utf8statetable.h rename to toolkit/components/translations/cld2/internal/utf8statetable.h diff --git a/toolkit/components/translation/cld2/moz.yaml b/toolkit/components/translations/cld2/moz.yaml similarity index 100% rename from toolkit/components/translation/cld2/moz.yaml rename to toolkit/components/translations/cld2/moz.yaml diff --git a/toolkit/components/translation/cld2/post.js b/toolkit/components/translations/cld2/post.js similarity index 100% rename from toolkit/components/translation/cld2/post.js rename to toolkit/components/translations/cld2/post.js diff --git a/toolkit/components/translation/cld2/public/compact_lang_det.h b/toolkit/components/translations/cld2/public/compact_lang_det.h similarity index 100% rename from toolkit/components/translation/cld2/public/compact_lang_det.h rename to toolkit/components/translations/cld2/public/compact_lang_det.h diff --git a/toolkit/components/translation/cld2/public/encodings.h b/toolkit/components/translations/cld2/public/encodings.h similarity index 100% rename from toolkit/components/translation/cld2/public/encodings.h rename to toolkit/components/translations/cld2/public/encodings.h diff --git a/toolkit/components/translations/moz.build b/toolkit/components/translations/moz.build index 0e6c222126b4..08c587aaa3c9 100644 --- a/toolkit/components/translations/moz.build +++ b/toolkit/components/translations/moz.build @@ -13,5 +13,13 @@ DIRS += ["actors"] BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] +XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.toml"] + +EXTRA_JS_MODULES.translations = [ + "cld2/cld-worker.js", + "cld2/cld-worker.js.mem", + "LanguageDetector.sys.mjs", +] + with Files("docs/**"): SCHEDULES.exclusive = ["docs"] diff --git a/toolkit/components/translation/test/unit/test_cld2.js b/toolkit/components/translations/tests/unit/test_cld2.js similarity index 99% rename from toolkit/components/translation/test/unit/test_cld2.js rename to toolkit/components/translations/tests/unit/test_cld2.js index a322b6061f7b..382617f184a6 100644 --- a/toolkit/components/translation/test/unit/test_cld2.js +++ b/toolkit/components/translations/tests/unit/test_cld2.js @@ -571,7 +571,7 @@ const { setTimeout } = ChromeUtils.importESModule( "resource://gre/modules/Timer.sys.mjs" ); let { LanguageDetector, workerManager } = ChromeUtils.importESModule( - "resource://gre/modules/translation/LanguageDetector.sys.mjs" + "resource://gre/modules/translations/LanguageDetector.sys.mjs" ); function check_result(result, langCode, expected) { diff --git a/toolkit/components/translation/test/unit/xpcshell.toml b/toolkit/components/translations/tests/unit/xpcshell.toml similarity index 100% rename from toolkit/components/translation/test/unit/xpcshell.toml rename to toolkit/components/translations/tests/unit/xpcshell.toml diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt index 0ae5adeafa6d..0a0acd46478e 100644 --- a/tools/rewriting/ThirdPartyPaths.txt +++ b/tools/rewriting/ThirdPartyPaths.txt @@ -190,7 +190,7 @@ toolkit/components/passwordmgr/shared/PasswordRulesParser.sys.mjs toolkit/components/protobuf/ toolkit/components/reader/readability/ toolkit/components/resistfingerprinting/content/gl-matrix.js -toolkit/components/translation/cld2/ +toolkit/components/translations/cld2/ toolkit/components/translations/bergamot-translator/thirdparty toolkit/components/translations/bergamot-translator/bergamot-translator.js toolkit/components/url-classifier/chromium/