Bug 1859081 - Move cld2 from toolkit/component/translation to transla…

…tions; r=translations-reviewers,zeid,frontend-codestyle-reviewers,nordzilla We developed the new translations codebase using an "s" at the end, and retained the old translations code under "translation". At this point I'm unifying it so that it's all under "translations", which involves a rename of the existing code. This way we will be consistent in our naming practice. Differential Revision: https://phabricator.services.mozilla.com/D239047
mozilla · Feb 26, 2025 · aa75c23 · aa75c23
1 parent aca5891
commit aa75c23
Show file tree

Hide file tree

Showing 79 changed files with 22 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/...ents/translation/LanguageDetector.sys.mjs → ...nts/translations/LanguageDetector.sys.mjs b/...ents/translation/LanguageDetector.sys.mjs → ...nts/translations/LanguageDetector.sys.mjs
diff --git 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
@@ -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 → toolkit/components/translations/cld2/LICENSE b/toolkit/components/translation/cld2/LICENSE → toolkit/components/translations/cld2/LICENSE
diff --git a/toolkit/components/translation/cld2/Makefile → ...kit/components/translations/cld2/Makefile b/toolkit/components/translation/cld2/Makefile → ...kit/components/translations/cld2/Makefile
diff --git a/...components/translation/cld2/cld-worker.js → ...omponents/translations/cld2/cld-worker.js b/...components/translation/cld2/cld-worker.js → ...omponents/translations/cld2/cld-worker.js
diff --git a/...onents/translation/cld2/cld-worker.js.mem → ...nents/translations/cld2/cld-worker.js.mem b/...onents/translation/cld2/cld-worker.js.mem → ...nents/translations/cld2/cld-worker.js.mem
diff --git a/toolkit/components/translation/cld2/cld.idl → toolkit/components/translations/cld2/cld.idl b/toolkit/components/translation/cld2/cld.idl → toolkit/components/translations/cld2/cld.idl
diff --git a/...kit/components/translation/cld2/cldapp.cc → ...it/components/translations/cld2/cldapp.cc b/...kit/components/translation/cld2/cldapp.cc → ...it/components/translations/cld2/cldapp.cc
diff --git a/...ponents/translation/cld2/internal/LICENSE → ...onents/translations/cld2/internal/LICENSE b/...ponents/translation/cld2/internal/LICENSE → ...onents/translations/cld2/internal/LICENSE
diff --git a/...slation/cld2/internal/cld2_dynamic_data.h → ...lations/cld2/internal/cld2_dynamic_data.h b/...slation/cld2/internal/cld2_dynamic_data.h → ...lations/cld2/internal/cld2_dynamic_data.h
diff --git a/.../cld2/internal/cld2_dynamic_data_loader.h → .../cld2/internal/cld2_dynamic_data_loader.h b/.../cld2/internal/cld2_dynamic_data_loader.h → .../cld2/internal/cld2_dynamic_data_loader.h
diff --git a/...internal/cld2_generated_cjk_compatible.cc → ...internal/cld2_generated_cjk_compatible.cc b/...internal/cld2_generated_cjk_compatible.cc → ...internal/cld2_generated_cjk_compatible.cc
diff --git a/...nal/cld2_generated_deltaoctachrome0122.cc → ...nal/cld2_generated_deltaoctachrome0122.cc b/...nal/cld2_generated_deltaoctachrome0122.cc → ...nal/cld2_generated_deltaoctachrome0122.cc
diff --git a/.../cld2_generated_distinctoctachrome0122.cc → .../cld2_generated_distinctoctachrome0122.cc b/.../cld2_generated_distinctoctachrome0122.cc → .../cld2_generated_distinctoctachrome0122.cc
diff --git a/...ernal/cld2_generated_quadchrome0122_16.cc → ...ernal/cld2_generated_quadchrome0122_16.cc b/...ernal/cld2_generated_quadchrome0122_16.cc → ...ernal/cld2_generated_quadchrome0122_16.cc
diff --git a/...nslation/cld2/internal/cld2tablesummary.h → ...slations/cld2/internal/cld2tablesummary.h b/...nslation/cld2/internal/cld2tablesummary.h → ...slations/cld2/internal/cld2tablesummary.h
diff --git a/.../internal/cld_generated_cjk_delta_bi_4.cc → .../internal/cld_generated_cjk_delta_bi_4.cc b/.../internal/cld_generated_cjk_delta_bi_4.cc → .../internal/cld_generated_cjk_delta_bi_4.cc
diff --git a/...internal/cld_generated_cjk_uni_prop_80.cc → ...internal/cld_generated_cjk_uni_prop_80.cc b/...internal/cld_generated_cjk_uni_prop_80.cc → ...internal/cld_generated_cjk_uni_prop_80.cc
diff --git a/...l/cld_generated_score_quad_octa_0122_2.cc → ...l/cld_generated_score_quad_octa_0122_2.cc b/...l/cld_generated_score_quad_octa_0122_2.cc → ...l/cld_generated_score_quad_octa_0122_2.cc
diff --git a/...ents/translation/cld2/internal/cldutil.cc → ...nts/translations/cld2/internal/cldutil.cc b/...ents/translation/cld2/internal/cldutil.cc → ...nts/translations/cld2/internal/cldutil.cc
diff --git a/...nents/translation/cld2/internal/cldutil.h → ...ents/translations/cld2/internal/cldutil.h b/...nents/translation/cld2/internal/cldutil.h → ...ents/translations/cld2/internal/cldutil.h
diff --git a/...anslation/cld2/internal/cldutil_shared.cc → ...nslations/cld2/internal/cldutil_shared.cc b/...anslation/cld2/internal/cldutil_shared.cc → ...nslations/cld2/internal/cldutil_shared.cc
diff --git a/...ranslation/cld2/internal/cldutil_shared.h → ...anslations/cld2/internal/cldutil_shared.h b/...ranslation/cld2/internal/cldutil_shared.h → ...anslations/cld2/internal/cldutil_shared.h
diff --git a/...slation/cld2/internal/compact_lang_det.cc → ...lations/cld2/internal/compact_lang_det.cc b/...slation/cld2/internal/compact_lang_det.cc → ...lations/cld2/internal/compact_lang_det.cc
diff --git a/...d2/internal/compact_lang_det_hint_code.cc → ...d2/internal/compact_lang_det_hint_code.cc b/...d2/internal/compact_lang_det_hint_code.cc → ...d2/internal/compact_lang_det_hint_code.cc
diff --git a/...ld2/internal/compact_lang_det_hint_code.h → ...ld2/internal/compact_lang_det_hint_code.h b/...ld2/internal/compact_lang_det_hint_code.h → ...ld2/internal/compact_lang_det_hint_code.h
diff --git a/...on/cld2/internal/compact_lang_det_impl.cc → ...ns/cld2/internal/compact_lang_det_impl.cc b/...on/cld2/internal/compact_lang_det_impl.cc → ...ns/cld2/internal/compact_lang_det_impl.cc
diff --git a/...ion/cld2/internal/compact_lang_det_impl.h → ...ons/cld2/internal/compact_lang_det_impl.h b/...ion/cld2/internal/compact_lang_det_impl.h → ...ons/cld2/internal/compact_lang_det_impl.h
diff --git a/...ponents/translation/cld2/internal/debug.h → ...onents/translations/cld2/internal/debug.h b/...ponents/translation/cld2/internal/debug.h → ...onents/translations/cld2/internal/debug.h
diff --git a/.../translation/cld2/internal/debug_empty.cc → ...translations/cld2/internal/debug_empty.cc b/.../translation/cld2/internal/debug_empty.cc → ...translations/cld2/internal/debug_empty.cc
diff --git a/...nslation/cld2/internal/fixunicodevalue.cc → ...slations/cld2/internal/fixunicodevalue.cc b/...nslation/cld2/internal/fixunicodevalue.cc → ...slations/cld2/internal/fixunicodevalue.cc
diff --git a/...anslation/cld2/internal/fixunicodevalue.h → ...nslations/cld2/internal/fixunicodevalue.h b/...anslation/cld2/internal/fixunicodevalue.h → ...nslations/cld2/internal/fixunicodevalue.h
diff --git a/.../cld2/internal/generated_distinct_bi_0.cc → .../cld2/internal/generated_distinct_bi_0.cc b/.../cld2/internal/generated_distinct_bi_0.cc → .../cld2/internal/generated_distinct_bi_0.cc
diff --git a/...ation/cld2/internal/generated_entities.cc → ...tions/cld2/internal/generated_entities.cc b/...ation/cld2/internal/generated_entities.cc → ...tions/cld2/internal/generated_entities.cc
diff --git a/...ation/cld2/internal/generated_language.cc → ...tions/cld2/internal/generated_language.cc b/...ation/cld2/internal/generated_language.cc → ...tions/cld2/internal/generated_language.cc
diff --git a/...lation/cld2/internal/generated_language.h → ...ations/cld2/internal/generated_language.h b/...lation/cld2/internal/generated_language.h → ...ations/cld2/internal/generated_language.h
diff --git a/...ation/cld2/internal/generated_ulscript.cc → ...tions/cld2/internal/generated_ulscript.cc b/...ation/cld2/internal/generated_ulscript.cc → ...tions/cld2/internal/generated_ulscript.cc
diff --git a/...lation/cld2/internal/generated_ulscript.h → ...ations/cld2/internal/generated_ulscript.h b/...lation/cld2/internal/generated_ulscript.h → ...ations/cld2/internal/generated_ulscript.h
diff --git a/...slation/cld2/internal/getonescriptspan.cc → ...lations/cld2/internal/getonescriptspan.cc b/...slation/cld2/internal/getonescriptspan.cc → ...lations/cld2/internal/getonescriptspan.cc
diff --git a/...nslation/cld2/internal/getonescriptspan.h → ...slations/cld2/internal/getonescriptspan.h b/...nslation/cld2/internal/getonescriptspan.h → ...slations/cld2/internal/getonescriptspan.h
diff --git a/...ranslation/cld2/internal/integral_types.h → ...anslations/cld2/internal/integral_types.h b/...ranslation/cld2/internal/integral_types.h → ...anslations/cld2/internal/integral_types.h
diff --git a/.../translation/cld2/internal/lang_script.cc → ...translations/cld2/internal/lang_script.cc b/.../translation/cld2/internal/lang_script.cc → ...translations/cld2/internal/lang_script.cc
diff --git a/...s/translation/cld2/internal/lang_script.h → .../translations/cld2/internal/lang_script.h b/...s/translation/cld2/internal/lang_script.h → .../translations/cld2/internal/lang_script.h
diff --git a/...ents/translation/cld2/internal/langspan.h → ...nts/translations/cld2/internal/langspan.h b/...ents/translation/cld2/internal/langspan.h → ...nts/translations/cld2/internal/langspan.h
diff --git a/...ts/translation/cld2/internal/offsetmap.cc → ...s/translations/cld2/internal/offsetmap.cc b/...ts/translation/cld2/internal/offsetmap.cc → ...s/translations/cld2/internal/offsetmap.cc
diff --git a/...nts/translation/cld2/internal/offsetmap.h → ...ts/translations/cld2/internal/offsetmap.h b/...nts/translation/cld2/internal/offsetmap.h → ...ts/translations/cld2/internal/offsetmap.h
diff --git a/...mponents/translation/cld2/internal/port.h → ...ponents/translations/cld2/internal/port.h b/...mponents/translation/cld2/internal/port.h → ...ponents/translations/cld2/internal/port.h
diff --git a/...ation/cld2/internal/scoreonescriptspan.cc → ...tions/cld2/internal/scoreonescriptspan.cc b/...ation/cld2/internal/scoreonescriptspan.cc → ...tions/cld2/internal/scoreonescriptspan.cc
diff --git a/...lation/cld2/internal/scoreonescriptspan.h → ...ations/cld2/internal/scoreonescriptspan.h b/...lation/cld2/internal/scoreonescriptspan.h → ...ations/cld2/internal/scoreonescriptspan.h
diff --git a/...s/translation/cld2/internal/stringpiece.h → .../translations/cld2/internal/stringpiece.h b/...s/translation/cld2/internal/stringpiece.h → .../translations/cld2/internal/stringpiece.h
diff --git a/...ponents/translation/cld2/internal/tote.cc → ...onents/translations/cld2/internal/tote.cc b/...ponents/translation/cld2/internal/tote.cc → ...onents/translations/cld2/internal/tote.cc
diff --git a/...mponents/translation/cld2/internal/tote.h → ...ponents/translations/cld2/internal/tote.h b/...mponents/translation/cld2/internal/tote.h → ...ponents/translations/cld2/internal/tote.h
diff --git a/...2/internal/utf8prop_lettermarkscriptnum.h → ...2/internal/utf8prop_lettermarkscriptnum.h b/...2/internal/utf8prop_lettermarkscriptnum.h → ...2/internal/utf8prop_lettermarkscriptnum.h
diff --git a/.../cld2/internal/utf8repl_lettermarklower.h → .../cld2/internal/utf8repl_lettermarklower.h b/.../cld2/internal/utf8repl_lettermarklower.h → .../cld2/internal/utf8repl_lettermarklower.h
diff --git a/.../internal/utf8scannot_lettermarkspecial.h → .../internal/utf8scannot_lettermarkspecial.h b/.../internal/utf8scannot_lettermarkspecial.h → .../internal/utf8scannot_lettermarkspecial.h
diff --git a/...anslation/cld2/internal/utf8statetable.cc → ...nslations/cld2/internal/utf8statetable.cc b/...anslation/cld2/internal/utf8statetable.cc → ...nslations/cld2/internal/utf8statetable.cc
diff --git a/...ranslation/cld2/internal/utf8statetable.h → ...anslations/cld2/internal/utf8statetable.h b/...ranslation/cld2/internal/utf8statetable.h → ...anslations/cld2/internal/utf8statetable.h
diff --git a/toolkit/components/translation/cld2/moz.yaml → ...kit/components/translations/cld2/moz.yaml b/toolkit/components/translation/cld2/moz.yaml → ...kit/components/translations/cld2/moz.yaml
diff --git a/toolkit/components/translation/cld2/post.js → toolkit/components/translations/cld2/post.js b/toolkit/components/translation/cld2/post.js → toolkit/components/translations/cld2/post.js
diff --git a/...ranslation/cld2/public/compact_lang_det.h → ...anslations/cld2/public/compact_lang_det.h b/...ranslation/cld2/public/compact_lang_det.h → ...anslations/cld2/public/compact_lang_det.h
diff --git a/...nents/translation/cld2/public/encodings.h → ...ents/translations/cld2/public/encodings.h b/...nents/translation/cld2/public/encodings.h → ...ents/translations/cld2/public/encodings.h
diff --git 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/...onents/translation/test/unit/test_cld2.js → ...ents/translations/tests/unit/test_cld2.js b/...onents/translation/test/unit/test_cld2.js → ...ents/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/...nents/translation/test/unit/xpcshell.toml → ...nts/translations/tests/unit/xpcshell.toml b/...nents/translation/test/unit/xpcshell.toml → ...nts/translations/tests/unit/xpcshell.toml
diff --git 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/