Merge pull request #2685 from tvdeyen/fix-tinymce-lang-setting

Fix Tinymce language config
AlchemyCMS · Jan 11, 2024 · bb89883 · bb89883
2 parents 9764055 + 93ac729
commit bb89883
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/javascript/alchemy_admin/components/tinymce.js b/app/javascript/alchemy_admin/components/tinymce.js
@@ -103,7 +103,7 @@ class Tinymce extends AlchemyHTMLElement {
     return {
       ...Alchemy.TinymceDefaults,
       ...customConfig,
-      locale: currentLocale(),
+      language: currentLocale(),
       selector: `#${this.editorId}`
     }
   }

diff --git a/spec/javascript/alchemy_admin/components/tinymce.spec.js b/spec/javascript/alchemy_admin/components/tinymce.spec.js
@@ -59,8 +59,8 @@ describe("alchemy-tinymce", () => {
       expect(component.configuration).toBeInstanceOf(Object)
     })
 
-    it("should have the locale", () => {
-      expect(component.configuration.locale).toEqual("en")
+    it("should have the language", () => {
+      expect(component.configuration.language).toEqual("en")
     })
 
     it("should add the attributes to configuration and cast dashes with underscores", () => {