move i18n language identifier fix to tinymce, the only place where is…

… needed
plone · Feb 14, 2025 · e68c0ef · e68c0ef
1 parent 40459c1
commit e68c0ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/core/i18n.js b/src/core/i18n.js
@@ -14,14 +14,6 @@ const i18n = function () {
     self.baseUrl = $("body").attr("data-i18ncatalogurl");
     self.currentLanguage = $("html").attr("lang") || "en";
 
-    // Fix for country specific languages
-    if (self.currentLanguage.split("-").length > 1) {
-        self.currentLanguage =
-            self.currentLanguage.split("-")[0] +
-            "_" +
-            self.currentLanguage.split("-")[1].toUpperCase();
-    }
-
     self.storage = null;
     self.catalogs = {};
     self.ttl = 24 * 3600 * 1000;

diff --git a/src/pat/tinymce/tinymce--implementation.js b/src/pat/tinymce/tinymce--implementation.js
@@ -122,6 +122,15 @@ export default class TinyMCE {
         var self = this;
         var i18n = new I18n();
         var lang = i18n.currentLanguage;
+
+        // Fix for country specific languages
+        if (lang.split("-").length > 1) {
+            lang =
+                lang.split("-")[0] +
+                "_" +
+                lang.split("-")[1].toUpperCase();
+        }
+
         if (lang !== "en" && self.options.tiny.language !== "en") {
             try {
                 await import(`tinymce-i18n/langs7/${lang}`);