[FEATURE] Implemented new way of getting the correct language researc…

…hed, added supported languages to fallback to EN
Yoast · Feb 9, 2025 · 432d2e6 · 432d2e6
1 parent 1cc7a8d
commit 432d2e6
Show file tree

Hide file tree

Showing 10 changed files with 158 additions and 88 deletions.
diff --git a/Build/resources/javascript/Components/FleschReadingScore.js b/Build/resources/javascript/Components/FleschReadingScore.js
@@ -106,6 +106,11 @@ function getDescriptionElement( score, difficulty, link ) {
 
 const FleschReadingScore = ({flesch}) => {
     if (flesch) {
+        if (flesch.result === false) {
+          // No flesch reading score available for the current language
+          return <></>
+        }
+
         let score = flesch.result.score;
 
         const description = useMemo(() => {

diff --git a/Build/resources/javascript/analysis/createAnalysisWorker.js b/Build/resources/javascript/analysis/createAnalysisWorker.js
@@ -1,7 +1,13 @@
 import {AnalysisWorkerWrapper, createWorker} from 'yoastseo';
 
+const loadWebWorker = ( language ) => {
+  const workerUnwrapped = createWorker( YoastConfig.urls.workerUrl );
+  workerUnwrapped.postMessage( { language } );
+  return new AnalysisWorkerWrapper( workerUnwrapped);
+}
+
 export default function createAnalysisWorker(useCornerstone, locale) {
-    const worker = new AnalysisWorkerWrapper( createWorker( YoastConfig.urls.workerUrl ) );
+    const worker = loadWebWorker(locale);
 
     worker.initialize( {
         locale: locale,

diff --git a/Build/resources/javascript/plugin.js b/Build/resources/javascript/plugin.js
@@ -30,6 +30,8 @@ let YoastTypo3 = {
 
     _progressBarInitialized: false,
 
+    _fallbackLanguage: 'en',
+
     init: function () {
         if (typeof YoastConfig === 'undefined') {
             return;
@@ -45,11 +47,13 @@ let YoastTypo3 = {
         }
     },
 
-    setWorker: function (cornerstone, locale = 'en_US') {
+    setWorker: function (cornerstone, locale = YoastTypo3._fallbackLanguage) {
         if (YoastTypo3._yoastWorker !== null) {
             YoastTypo3._yoastWorker._worker.terminate();
         }
-        YoastTypo3._yoastWorker = createAnalysisWorker(cornerstone, locale);
+        const languageCode = locale.slice(0, 2);
+        const supportedLocale = YoastConfig.supportedLanguages.includes(languageCode) ? languageCode : YoastTypo3._fallbackLanguage;
+        YoastTypo3._yoastWorker = createAnalysisWorker(cornerstone, supportedLocale);
     },
 
     setLocales: function () {
@@ -246,7 +250,7 @@ let YoastPlugin = {
         let cornerStoneField = YoastPlugin.getFormEngineElement('cornerstone');
         if (cornerStoneField !== null) {
             cornerStoneField.addEventListener('change', function () {
-                YoastTypo3.setWorker(this.checked);
+                YoastTypo3.setWorker(this.checked, store.getState().content.locale);
                 YoastPlugin.refreshAnalysis();
             });
         }

diff --git a/Build/resources/javascript/worker.js b/Build/resources/javascript/worker.js
@@ -1,5 +1,10 @@
 import { AnalysisWebWorker } from "yoastseo";
-import EnglishResearcher from "yoastseo/build/languageProcessing/languages/en/Researcher";
 
-const worker = new AnalysisWebWorker( self, new EnglishResearcher() );
-worker.register();
+self.onmessage = ( event ) => {
+  // Set the language for the Researcher
+  const language = event.data.language;
+  const { "default": Researcher } = require( `yoastseo/build/languageProcessing/languages/${language}/Researcher` );
+  const researcher = new Researcher();
+  const worker = new AnalysisWebWorker( self, researcher );
+  worker.register();
+};
diff --git a/Classes/Form/Element/InternalLinkingSuggestion.php b/Classes/Form/Element/InternalLinkingSuggestion.php
@@ -59,6 +59,7 @@ public function render(): array
                     ->buildUriFromRoute('ajax_yoast_internal_linking_suggestions'),
             ],
             'translations' => [$this->localeService->getTranslations()],
+            'supportedLanguages' => $this->localeService->getSupportedLanguages(),
         ]);
 
         $this->javascriptService->loadPluginJavascript();

diff --git a/Classes/Service/LocaleService.php b/Classes/Service/LocaleService.php
@@ -141,4 +141,12 @@ public function getLanguageIdFromData(array $data): int
         }
         return (int)$data['databaseRow']['sys_language_uid'];
     }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getSupportedLanguages(): array
+    {
+        return $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['yoast_seo']['supportedLanguages'] ?? [];
+    }
 }
diff --git a/Classes/Service/SnippetPreviewService.php b/Classes/Service/SnippetPreviewService.php
@@ -41,6 +41,7 @@ public function buildSnippetPreview(
                 'synonyms' => (string)($currentData['tx_yoastseo_focuskeyword_synonyms'] ?? ''),
             ],
             'translations' => [$this->localeService->getTranslations()],
+            'supportedLanguages' => $this->localeService->getSupportedLanguages(),
         ];
 
         $this->javascriptService->loadPluginJavascript();

diff --git a/Classes/Utility/ConfigurationUtility.php b/Classes/Utility/ConfigurationUtility.php
@@ -34,13 +34,16 @@ public static function getDefaultConfiguration(): array
                 'page' => 1,
                 'backend_section' => 6,
             ],
+            // Translations for the backend
             'translations' => [
                 'availableLocales' => [
                     'ar',
                     'bg_BG',
                     'bs_BA',
                     'ca',
+                    'ca_valencia',
                     'da_DK',
+                    'de_AT',
                     'de_CH',
                     'de_DE',
                     'el',
@@ -51,19 +54,24 @@ public static function getDefaultConfiguration(): array
                     'en_ZA',
                     'es_AR',
                     'es_CL',
+                    'es_CO',
                     'es_CR',
                     'es_EC',
                     'es_ES',
                     'es_MX',
+                    'es_PE',
+                    'es_VE',
                     'fa_IR',
                     'fi',
                     'fr_BE',
                     'fr_CA',
                     'fr_FR',
+                    'fy',
                     'gl_ES',
                     'he_IL',
                     'hi_IN',
                     'hr',
+                    'hu_HU',
                     'id_ID',
                     'it_IT',
                     'ja',
@@ -73,7 +81,7 @@ public static function getDefaultConfiguration(): array
                     'nl_BE',
                     'nl_NL',
                     'pl_PL',
-                    'pl_AO',
+                    'pt_AO',
                     'pt_BR',
                     'pt_PT',
                     'ro_RO',
@@ -91,24 +99,56 @@ public static function getDefaultConfiguration(): array
                 ],
                 'languageKeyToLocaleMapping' => [
                     'bg' => 'bg_BG',
+                    'cs' => 'cs_CZ',
                     'da' => 'da_DK',
                     'de' => 'de_DE',
                     'en' => 'en_GB',
                     'es' => 'es_ES',
                     'fa' => 'fa_IR',
                     'fr' => 'fr_FR',
                     'he' => 'he_IL',
+                    'hu' => 'hu_HU',
+                    'id' => 'id_ID',
                     'it' => 'it_IT',
+                    'ko' => 'ko_KR',
                     'no' => 'nb_NO',
                     'nl' => 'nl_NL',
                     'pl' => 'pl_PL',
                     'pt' => 'pt_PT',
+                    'ro' => 'ro_RO',
                     'ru' => 'ru_RU',
                     'sk' => 'sk_SK',
+                    'sr' => 'sr_RS',
                     'sv' => 'sv_SE',
                     'tr' => 'tr_TR',
+                    'zh' => 'zh_CN',
                 ],
             ],
+            // Supported languages for content analysis
+            'supportedLanguages' => [
+                'ar',
+                'ca',
+                'cs',
+                'de',
+                'el',
+                'en',
+                'es',
+                'fa',
+                'fr',
+                'he',
+                'hu',
+                'id',
+                'it',
+                'ja',
+                'nb',
+                'nl',
+                'pl',
+                'pt',
+                'ru',
+                'sk',
+                'sv',
+                'tr'
+            ],
             'previewSettings' => [
                 'basicAuth' => [
                     'username' => '',

diff --git a/Resources/Public/JavaScript/dist/plugin.js b/Resources/Public/JavaScript/dist/plugin.js
diff --git a/Resources/Public/JavaScript/dist/worker.js b/Resources/Public/JavaScript/dist/worker.js