From a2ebe773e88209d3768e574b782a0d7409642c00 Mon Sep 17 00:00:00 2001
From: mikolaj <mikolaj.adamczyk@ez.no>
Date: Wed, 23 Aug 2023 10:15:58 +0200
Subject: [PATCH 1/4] Renamed domain names

---
 ...ldtype.en.xliff => ibexa_matrix_fieldtype.en.xliff} | 10 ++++++++++
 .../content_edit_form_fields.html.twig                 |  4 ++--
 .../admin/matrix_fieldtype/content_fields.html.twig    |  2 +-
 .../admin/matrix_fieldtype/field_types.html.twig       |  3 ++-
 src/lib/FieldType/Mapper/MatrixFormMapper.php          |  4 ++--
 src/lib/Form/Type/ColumnType.php                       |  2 +-
 src/lib/Form/Type/FieldType/MatrixFieldType.php        |  2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)
 rename src/bundle/Resources/translations/{matrix_fieldtype.en.xliff => ibexa_matrix_fieldtype.en.xliff} (85%)

diff --git a/src/bundle/Resources/translations/matrix_fieldtype.en.xliff b/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
similarity index 85%
rename from src/bundle/Resources/translations/matrix_fieldtype.en.xliff
rename to src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
index b4a73d7..146b71a 100644
--- a/src/bundle/Resources/translations/matrix_fieldtype.en.xliff
+++ b/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
@@ -16,6 +16,16 @@
         <target state="new">Delete</target>
         <note>key: ezmatrix.remove</note>
       </trans-unit>
+      <trans-unit id="8422049ef51bbcd967ea5578aee3ed094edd252c" resname="field.column.add_new">
+        <source>Add new</source>
+        <target state="new">Add new</target>
+        <note>key: field.column.add_new</note>
+      </trans-unit>
+      <trans-unit id="ba5b5f28d4530d7374b45639acfe2b7ed6277497" resname="field.column.delete">
+        <source>Delete</source>
+        <target state="new">Delete</target>
+        <note>key: field.column.delete</note>
+      </trans-unit>
       <trans-unit id="fa41ae6cab6d74c6548f4052c02c0c5129a27f1d" resname="field.column.identifier">
         <source>Identifier</source>
         <target state="new">Identifier</target>
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
index ce3f69b..aa3d7a4 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_edit_form_fields.html.twig
@@ -1,4 +1,4 @@
-{% trans_default_domain 'matrix_fieldtype' %}
+{% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
 {% block ezplatform_fieldtype_ezmatrix_widget %}
     {% set readonly = attr.readonly|default(false) %}
@@ -29,7 +29,7 @@
     } %}
         {% block header %}
             {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
-                {% trans_default_domain 'matrix_fieldtype' %}
+                {% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
                 {% block actions %}
                     <button
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
index 3d65f61..fe84823 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/content_fields.html.twig
@@ -1,4 +1,4 @@
-{% trans_default_domain 'matrix_fieldtype' %}
+{% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
 {% block ezmatrix_field %}
     {% set columnsSettings = fieldSettings['columns'] %}
diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
index bc9c0ac..0a2676f 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
@@ -1,4 +1,4 @@
-{% trans_default_domain 'matrix_fieldtype' %}
+{% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
 {% set fieldtype_name = 'ezmatrix.name'|trans({}, 'fieldtypes')|desc('Matrix') %}
 
@@ -60,6 +60,7 @@
         } %}
             {% block header %}
                 {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
+                    {% trans_default_domain 'ibexa_matrix_fieldtype' %}
                     {% block actions %}
                         <button type="button" class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small ibexa-btn--add-column">
                             <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
diff --git a/src/lib/FieldType/Mapper/MatrixFormMapper.php b/src/lib/FieldType/Mapper/MatrixFormMapper.php
index 0ec674a..69f08be 100644
--- a/src/lib/FieldType/Mapper/MatrixFormMapper.php
+++ b/src/lib/FieldType/Mapper/MatrixFormMapper.php
@@ -38,7 +38,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                 'required' => false,
                 'property_path' => 'fieldSettings[minimum_rows]',
                 'label' => /** @Desc("Minimum number of rows") */ 'field_definition.ezmatrix.minimum_rows',
-                'translation_domain' => 'matrix_fieldtype',
+                'translation_domain' => 'ibexa_matrix_fieldtype',
                 'disabled' => $isTranslation,
             ])
             ->add('columns', CollectionType::class, [
@@ -52,7 +52,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                 'required' => false,
                 'property_path' => 'fieldSettings[columns]',
                 'label' => /** @Desc("Columns") */ 'field_definition.ezmatrix.columns',
-                'translation_domain' => 'matrix_fieldtype',
+                'translation_domain' => 'ibexa_matrix_fieldtype',
                 'disabled' => $isTranslation,
             ]);
     }
diff --git a/src/lib/Form/Type/ColumnType.php b/src/lib/Form/Type/ColumnType.php
index 715e9fd..06118ae 100644
--- a/src/lib/Form/Type/ColumnType.php
+++ b/src/lib/Form/Type/ColumnType.php
@@ -35,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
      */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefault('translation_domain', 'matrix_fieldtype');
+        $resolver->setDefault('translation_domain', 'ibexa_matrix_fieldtype');
     }
 }
 
diff --git a/src/lib/Form/Type/FieldType/MatrixFieldType.php b/src/lib/Form/Type/FieldType/MatrixFieldType.php
index 99b7eb8..7fb3558 100644
--- a/src/lib/Form/Type/FieldType/MatrixFieldType.php
+++ b/src/lib/Form/Type/FieldType/MatrixFieldType.php
@@ -45,7 +45,7 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setDefined(['columns', 'minimum_rows']);
         $resolver->addAllowedTypes('columns', 'array');
         $resolver->addAllowedTypes('minimum_rows', 'integer');
-        $resolver->setDefault('translation_domain', 'matrix_fieldtype');
+        $resolver->setDefault('translation_domain', 'ibexa_matrix_fieldtype');
     }
 
     /**

From 57fb2c43f8268e46a7ab9a690a846cbe5f60f0b5 Mon Sep 17 00:00:00 2001
From: mikolaj <mikolaj.adamczyk@ez.no>
Date: Tue, 29 Aug 2023 13:45:15 +0200
Subject: [PATCH 2/4] Renamed domain names - ibexa_fieldtypes

---
 .../views/themes/admin/matrix_fieldtype/field_types.html.twig   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
index 0a2676f..314d608 100644
--- a/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
+++ b/src/bundle/Resources/views/themes/admin/matrix_fieldtype/field_types.html.twig
@@ -1,6 +1,6 @@
 {% trans_default_domain 'ibexa_matrix_fieldtype' %}
 
-{% set fieldtype_name = 'ezmatrix.name'|trans({}, 'fieldtypes')|desc('Matrix') %}
+{% set fieldtype_name = 'ezmatrix.name'|trans({}, 'ibexa_fieldtypes')|desc('Matrix') %}
 
 {% block ezmatrix_field_definition_edit %}
     <div class="ibexa-matrix-settings__minimum-rows">

From 3017bf5f712f53d9e8574bc587f2e71f47c4976a Mon Sep 17 00:00:00 2001
From: mikolaj <mikolaj.adamczyk@ez.no>
Date: Tue, 29 Aug 2023 14:40:04 +0200
Subject: [PATCH 3/4] Renamed domain names - ibexa_fieldtypes

---
 .../{fieldtypes.en.xliff => ibexa_fieldtypes.en.xliff}            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/bundle/Resources/translations/{fieldtypes.en.xliff => ibexa_fieldtypes.en.xliff} (100%)

diff --git a/src/bundle/Resources/translations/fieldtypes.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes.en.xliff
similarity index 100%
rename from src/bundle/Resources/translations/fieldtypes.en.xliff
rename to src/bundle/Resources/translations/ibexa_fieldtypes.en.xliff

From 2918ac05f7c8999b0b6e544f5e4a50b711865365 Mon Sep 17 00:00:00 2001
From: mikolaj <mikolaj.adamczyk@ez.no>
Date: Mon, 4 Sep 2023 15:54:15 +0200
Subject: [PATCH 4/4] Renamed domain names

---
 .../ibexa_matrix_fieldtype.en.xliff           |  4 ++--
 .../Resources/translations/messages.en.xliff  | 21 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 src/bundle/Resources/translations/messages.en.xliff

diff --git a/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff b/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
index 146b71a..4080e19 100644
--- a/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
+++ b/src/bundle/Resources/translations/ibexa_matrix_fieldtype.en.xliff
@@ -17,8 +17,8 @@
         <note>key: ezmatrix.remove</note>
       </trans-unit>
       <trans-unit id="8422049ef51bbcd967ea5578aee3ed094edd252c" resname="field.column.add_new">
-        <source>Add new</source>
-        <target state="new">Add new</target>
+        <source>Add</source>
+        <target state="new">Add</target>
         <note>key: field.column.add_new</note>
       </trans-unit>
       <trans-unit id="ba5b5f28d4530d7374b45639acfe2b7ed6277497" resname="field.column.delete">
diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff
deleted file mode 100644
index 19228d5..0000000
--- a/src/bundle/Resources/translations/messages.en.xliff
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file source-language="en" target-language="en" datatype="plaintext" original="not.available">
-    <header>
-      <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
-      <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
-    </header>
-    <body>
-      <trans-unit id="8422049ef51bbcd967ea5578aee3ed094edd252c" resname="field.column.add_new">
-        <source>Add</source>
-        <target state="new">Add</target>
-        <note>key: field.column.add_new</note>
-      </trans-unit>
-      <trans-unit id="ba5b5f28d4530d7374b45639acfe2b7ed6277497" resname="field.column.delete">
-        <source>Delete</source>
-        <target state="new">Delete</target>
-        <note>key: field.column.delete</note>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>