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

Fix item headline See merge request metamodels/core!295
MetaModels · Jul 8, 2024 · fe52585 · fe52585
2 parents 60c2a1b + 06a7d94
commit fe52585
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CoreBundle/EventListener/DcGeneral/Table/DcaSetting/EditMaskSubHeadlineListener.php b/src/CoreBundle/EventListener/DcGeneral/Table/DcaSetting/EditMaskSubHeadlineListener.php
@@ -99,7 +99,7 @@ public function __invoke(GetEditMaskSubHeadlineEvent $event): void
         $screen        = $this->inputScreens->fetchInputScreens([$metaModelName => $metaModel->getActiveInputScreen()]);
         $screenMeta    = $screen[$metaModelName]['meta'] ?? null;
 
-        if (null === $screenMeta || null === ($headline = ($screenMeta['subheadline'] ?? null))) {
+        if (null === $screenMeta || '' === ($headline = ($screenMeta['subheadline'] ?? ''))) {
             return;
         }
 
@@ -114,7 +114,7 @@ public function __invoke(GetEditMaskSubHeadlineEvent $event): void
 
         // Translate language key and add headline part.
         $subHeadline =
-            $this->translator->trans('editRecord', ['%item%' => $headlineAdd], $metaModelName);
+            $this->translator->trans('editRecord', ['%id%' => $headlineAdd], $metaModelName);
 
         $event->setHeadline($subHeadline);
     }

diff --git a/src/CoreBundle/Resources/translations/tl_metamodel_item.en.xlf b/src/CoreBundle/Resources/translations/tl_metamodel_item.en.xlf
@@ -91,7 +91,7 @@
         <source>Check this if you want to make this the base for the current variant group</source>
       </trans-unit>
       <trans-unit id="editRecord" resname="editRecord">
-        <source>Edit item %item%</source>
+        <source>Edit item %id%</source>
       </trans-unit>
       <trans-unit id="newRecord" resname="newRecord">
         <source>Create a new item</source>