Merge branch '4.5' into main

# Conflicts: # src/lib/FieldType/Mapper/MatrixFormMapper.php
ibexa · Dec 6, 2023 · 5ebb181 · 5ebb181
2 parents ed78967 + c96904f
commit 5ebb181
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff b/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
@@ -41,11 +41,6 @@
         <target state="new">Columns</target>
         <note>key: field.columns</note>
       </trans-unit>
-      <trans-unit id="207b1ea4ef32f10b29a4cff6869126da1f4b980a" resname="field_definition.ezmatrix.columns">
-        <source>Columns</source>
-        <target state="new">Columns</target>
-        <note>key: field_definition.ezmatrix.columns</note>
-      </trans-unit>
       <trans-unit id="07c51cf854c53ebcc11d9261c7ca5b0772d7f7a4" resname="field_definition.ezmatrix.minimum_rows">
         <source>Minimum number of rows</source>
         <target state="new">Minimum number of rows</target>

diff --git a/src/lib/FieldType/Mapper/MatrixFormMapper.php b/src/lib/FieldType/Mapper/MatrixFormMapper.php
@@ -51,7 +51,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                 'prototype_name' => '__number__',
                 'required' => false,
                 'property_path' => 'fieldSettings[columns]',
-                'label' => /** @Desc("Columns") */ 'field_definition.ezmatrix.columns',
+                'label' => false,
                 'translation_domain' => 'ibexa_matrix_fieldtype',
                 'disabled' => $isTranslation,
             ]);