Merge branch 'hotfix/fix_legend_for_untrans_models' into 'release/2.3.0'

Fix output legends for untranslated models See merge request metamodels/core!300
MetaModels · Jul 12, 2024 · b2b75ce · b2b75ce
2 parents 3e38d14 + e867dfa
commit b2b75ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,6 @@ Feel free to contribute the MetaModel Documentation in [EN](https://github.com/M
 ## Resources:
 
 * [MetaModels Website](https://now.metamodel.me)
-* [MetaModels Contao Wiki [DE]](https://de.contaowiki.org/MetaModels)
 * [MetaModels Contao Community Subforum [DE]](https://community.contao.org/de/forumdisplay.php?149-MetaModels)
 * [MetaModels Channel on Contao Slack #metamodels](https://contao.slack.com/archives/CKGEBDV60)
 

diff --git a/src/BackendIntegration/InputScreen/InputScreen.php b/src/BackendIntegration/InputScreen/InputScreen.php
@@ -281,7 +281,7 @@ protected function translateRows($rows)
         // First pass, fetch all attribute names.
         $columnNames = [];
         foreach ($rows as $row) {
-            if ($row['dcatype'] != 'attribute') {
+            if ($row['dcatype'] !== 'attribute') {
                 continue;
             }
 

diff --git a/src/CoreBundle/Translator/MetaModelTranslationLoader.php b/src/CoreBundle/Translator/MetaModelTranslationLoader.php
@@ -184,9 +184,11 @@ private function handleInputScreen(
         $prefix = 'inputscreen.' . $inputScreen['meta']['id'] . '.';
 
         foreach ($inputScreen['legends'] as $index => $legend) {
-            $value = $this->extractLangString($legend['label'], $locale, $mainLanguage) ?? '';
+            $value = $this->extractLangString($legend['label'], $locale, $mainLanguage);
             // Suffix '_legend' due to EditMask in DcGeneral.
-            $catalog->set($prefix . $index . '_legend', $value, $domain);
+            if (null !== $value) {
+                $catalog->set($prefix . $index . '_legend', $value, $domain);
+            }
         }
 
         if ('standalone' === $inputScreen['meta']['rendertype']) {