From f9a5061f3a56e903b5cd38fbfd8435f309fcd5c8 Mon Sep 17 00:00:00 2001 From: Thorsten Reiter Date: Tue, 9 Jul 2024 11:43:21 +0200 Subject: [PATCH 1/3] IBX-8502: Added unsupported locale fallback --- .../Resources/public/js/CKEditor/core/base-ckeditor.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js b/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js index 517d6276..dc2afeda 100644 --- a/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js +++ b/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js @@ -125,7 +125,12 @@ const VIEWPORT_TOP_OFFSET_DISTRACTION_FREE_MODE = 0; const wrapper = this.getHTMLDocumentFragment(container.closest('.ibexa-data-source').querySelector('textarea').value); const section = wrapper.childNodes[0]; const { toolbar, extraPlugins = [], extraConfig = {} } = window.ibexa.richText.CKEditor; - const locale = new Intl.Locale(doc.querySelector('meta[name="LanguageCode"]').content); + let locale; + try{ + locale = new Intl.Locale(doc.querySelector('meta[name="LanguageCode"]').content); + }catch (e){ + locale = new Intl.Locale('eng-GB'); + } const blockCustomStyles = Object.entries(ibexa.richText.customStyles) .filter(([, customStyleConfig]) => !customStyleConfig.inline) .map(([customStyleName, customStyleConfig]) => { From ac13e75960116b816252dbf66aecb5221dc9a578 Mon Sep 17 00:00:00 2001 From: Thorsten Reiter Date: Tue, 9 Jul 2024 11:53:12 +0200 Subject: [PATCH 2/3] run yarn prettier --- .../Resources/public/js/CKEditor/core/base-ckeditor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js b/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js index dc2afeda..63bfe617 100644 --- a/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js +++ b/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js @@ -126,10 +126,10 @@ const VIEWPORT_TOP_OFFSET_DISTRACTION_FREE_MODE = 0; const section = wrapper.childNodes[0]; const { toolbar, extraPlugins = [], extraConfig = {} } = window.ibexa.richText.CKEditor; let locale; - try{ - locale = new Intl.Locale(doc.querySelector('meta[name="LanguageCode"]').content); - }catch (e){ - locale = new Intl.Locale('eng-GB'); + try { + locale = new Intl.Locale(doc.querySelector('meta[name="LanguageCode"]').content); + } catch (e) { + locale = new Intl.Locale('eng-GB'); } const blockCustomStyles = Object.entries(ibexa.richText.customStyles) .filter(([, customStyleConfig]) => !customStyleConfig.inline) From 3591606cfb504ce906a874da063a3125b5c9ce5d Mon Sep 17 00:00:00 2001 From: Thorsten Reiter Date: Fri, 9 Aug 2024 09:17:22 +0200 Subject: [PATCH 3/3] added console.warn --- src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js b/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js index 63bfe617..b78a00e3 100644 --- a/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js +++ b/src/bundle/Resources/public/js/CKEditor/core/base-ckeditor.js @@ -129,6 +129,9 @@ const VIEWPORT_TOP_OFFSET_DISTRACTION_FREE_MODE = 0; try { locale = new Intl.Locale(doc.querySelector('meta[name="LanguageCode"]').content); } catch (e) { + console.warn( + `Unsupported LanguageCode '${doc.querySelector('meta[name="LanguageCode"]').content}' - using fallback 'eng-GB'.`, + ); locale = new Intl.Locale('eng-GB'); } const blockCustomStyles = Object.entries(ibexa.richText.customStyles)