diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_fieldtype.en.xliff b/src/bundle/Resources/translations/ezplatform_content_forms_fieldtype.en.xliff deleted file mode 100644 index 5e36f1c4..00000000 --- a/src/bundle/Resources/translations/ezplatform_content_forms_fieldtype.en.xliff +++ /dev/null @@ -1,116 +0,0 @@ - - - -
- - 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. -
- - - File - File - key: content.field_type.binary_base.file - - - Remove - Remove - key: content.field_type.binary_base.remove - - - Email - Email - key: content.field_type.ezauthor.email - - - Name - Name - key: content.field_type.ezauthor.name - - - Address - Address - key: content.field_type.ezgmaplocation.address - - - Latitude - Latitude - key: content.field_type.ezgmaplocation.latitude - - - Longitude - Longitude - key: content.field_type.ezgmaplocation.longitude - - - Alternative text - Alternative text - key: content.field_type.ezimage.alternative_text - - - Alternative text - Alternative text - key: content.field_type.ezimageasset.alternative_text - - - Autoplay - Autoplay - key: content.field_type.ezmedia.autoplay - - - Display controls - Display controls - key: content.field_type.ezmedia.display_controls - - - Height - Height - key: content.field_type.ezmedia.height - - - Loop - Loop - key: content.field_type.ezmedia.loop - - - Width - Width - key: content.field_type.ezmedia.width - - - URL - URL - key: content.field_type.ezurl.link - - - Text - Text - key: content.field_type.ezurl.text - - - Email - Email - key: content.field_type.ezuser.email - - - Enabled - Enabled - key: content.field_type.ezuser.enabled - - - Password - Password - key: content.field_type.ezuser.password - - - Confirm password - Confirm password - key: content.field_type.ezuser.password_confirm - - - Username - Username - key: content.field_type.ezuser.username - - -
-
diff --git a/src/bundle/Resources/translations/content_edit.en.xliff b/src/bundle/Resources/translations/ibexa_content_edit.en.xliff similarity index 100% rename from src/bundle/Resources/translations/content_edit.en.xliff rename to src/bundle/Resources/translations/ibexa_content_edit.en.xliff diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_content.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_content.en.xliff similarity index 100% rename from src/bundle/Resources/translations/ezplatform_content_forms_content.en.xliff rename to src/bundle/Resources/translations/ibexa_content_forms_content.en.xliff diff --git a/src/bundle/Resources/translations/ibexa_content_forms_fieldtype.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_fieldtype.en.xliff index ad72a6e0..4184806a 100644 --- a/src/bundle/Resources/translations/ibexa_content_forms_fieldtype.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_forms_fieldtype.en.xliff @@ -6,6 +6,111 @@ 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. + + File + File + key: content.field_type.binary_base.file + + + Remove + Remove + key: content.field_type.binary_base.remove + + + Email + Email + key: content.field_type.ezauthor.email + + + Name + Name + key: content.field_type.ezauthor.name + + + Address + Address + key: content.field_type.ezgmaplocation.address + + + Latitude + Latitude + key: content.field_type.ezgmaplocation.latitude + + + Longitude + Longitude + key: content.field_type.ezgmaplocation.longitude + + + Alternative text + Alternative text + key: content.field_type.ezimage.alternative_text + + + Alternative text + Alternative text + key: content.field_type.ezimageasset.alternative_text + + + Autoplay + Autoplay + key: content.field_type.ezmedia.autoplay + + + Display controls + Display controls + key: content.field_type.ezmedia.display_controls + + + Height + Height + key: content.field_type.ezmedia.height + + + Loop + Loop + key: content.field_type.ezmedia.loop + + + Width + Width + key: content.field_type.ezmedia.width + + + URL + URL + key: content.field_type.ezurl.link + + + Text + Text + key: content.field_type.ezurl.text + + + Email + Email + key: content.field_type.ezuser.email + + + Enabled + Enabled + key: content.field_type.ezuser.enabled + + + Password + Password + key: content.field_type.ezuser.password + + + Confirm password + Confirm password + key: content.field_type.ezuser.password_confirm + + + Username + Username + key: content.field_type.ezuser.username + Select Starting Location Select Starting Location diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_user.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_user.en.xliff similarity index 100% rename from src/bundle/Resources/translations/ezplatform_content_forms_user.en.xliff rename to src/bundle/Resources/translations/ibexa_content_forms_user.en.xliff diff --git a/src/bundle/Resources/translations/ezplatform_fields_groups.en.xliff b/src/bundle/Resources/translations/ibexa_fields_groups.en.xliff similarity index 91% rename from src/bundle/Resources/translations/ezplatform_fields_groups.en.xliff rename to src/bundle/Resources/translations/ibexa_fields_groups.en.xliff index 318ca623..dac50dcb 100644 --- a/src/bundle/Resources/translations/ezplatform_fields_groups.en.xliff +++ b/src/bundle/Resources/translations/ibexa_fields_groups.en.xliff @@ -8,12 +8,12 @@ Content - Content + Content key: content Metadata - Metadata + Metadata key: metadata diff --git a/src/lib/Content/Form/Provider/GroupedContentFormFieldsProvider.php b/src/lib/Content/Form/Provider/GroupedContentFormFieldsProvider.php index 0b3a9a07..938034e1 100644 --- a/src/lib/Content/Form/Provider/GroupedContentFormFieldsProvider.php +++ b/src/lib/Content/Form/Provider/GroupedContentFormFieldsProvider.php @@ -10,8 +10,10 @@ use Ibexa\Contracts\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProviderInterface; use Ibexa\Core\Helper\FieldsGroups\FieldsGroupsList; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; -final class GroupedContentFormFieldsProvider implements GroupedContentFormFieldsProviderInterface +final class GroupedContentFormFieldsProvider implements GroupedContentFormFieldsProviderInterface, TranslationContainerInterface { /** @var \Ibexa\Core\Helper\FieldsGroups\FieldsGroupsList */ private $fieldsGroupsList; @@ -37,4 +39,12 @@ public function getGroupedFields(array $fieldsDataForm): array return $groupedFields; } + + public static function getTranslationMessages(): array + { + return [ + Message::create('content', 'ibexa_fields_groups')->setDesc('Content'), + Message::create('metadata', 'ibexa_fields_groups')->setDesc('Metadata'), + ]; + } } diff --git a/src/lib/FieldType/Mapper/UserAccountFieldValueFormMapper.php b/src/lib/FieldType/Mapper/UserAccountFieldValueFormMapper.php index a797044d..26f9d9b5 100644 --- a/src/lib/FieldType/Mapper/UserAccountFieldValueFormMapper.php +++ b/src/lib/FieldType/Mapper/UserAccountFieldValueFormMapper.php @@ -71,7 +71,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_content', + 'translation_domain' => 'ibexa_content_forms_content', ]); } diff --git a/src/lib/Form/Type/Content/BaseContentType.php b/src/lib/Form/Type/Content/BaseContentType.php index 52b9b620..cf2fdfce 100644 --- a/src/lib/Form/Type/Content/BaseContentType.php +++ b/src/lib/Form/Type/Content/BaseContentType.php @@ -8,6 +8,7 @@ namespace Ibexa\ContentForms\Form\Type\Content; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; @@ -60,7 +61,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver - ->setDefaults(['translation_domain' => 'ezplatform_content_forms_content']) + ->setDefaults(['translation_domain' => 'ibexa_content_forms_content']) ->setRequired(['languageCode', 'mainLanguageCode']); } } diff --git a/src/lib/Form/Type/Content/ContentDraftCreateType.php b/src/lib/Form/Type/Content/ContentDraftCreateType.php index 01346695..1213b873 100644 --- a/src/lib/Form/Type/Content/ContentDraftCreateType.php +++ b/src/lib/Form/Type/Content/ContentDraftCreateType.php @@ -70,7 +70,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(['translation_domain' => 'ezplatform_content_forms_content']); + $resolver->setDefaults(['translation_domain' => 'ibexa_content_forms_content']); } } diff --git a/src/lib/Form/Type/Content/ContentEditType.php b/src/lib/Form/Type/Content/ContentEditType.php index 8efd5892..01951769 100644 --- a/src/lib/Form/Type/Content/ContentEditType.php +++ b/src/lib/Form/Type/Content/ContentEditType.php @@ -64,7 +64,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'hidden' => true, 'formnovalidate' => 'formnovalidate', ], - 'translation_domain' => 'content_edit', + 'translation_domain' => 'ibexa_content_edit', ]); } @@ -82,7 +82,7 @@ public function configureOptions(OptionsResolver $resolver) 'drafts_enabled' => false, 'autosave_enabled' => true, 'data_class' => ContentStruct::class, - 'translation_domain' => 'ezplatform_content_forms_content', + 'translation_domain' => 'ibexa_content_forms_content', 'intent' => 'update', ]); } diff --git a/src/lib/Form/Type/Content/ContentFieldType.php b/src/lib/Form/Type/Content/ContentFieldType.php index a85041bd..b4a17f3e 100644 --- a/src/lib/Form/Type/Content/ContentFieldType.php +++ b/src/lib/Form/Type/Content/ContentFieldType.php @@ -49,7 +49,7 @@ public function configureOptions(OptionsResolver $resolver) 'contentCreateStruct' => null, 'contentUpdateStruct' => null, 'data_class' => FieldData::class, - 'translation_domain' => 'ezplatform_content_forms_content', + 'translation_domain' => 'ibexa_content_forms_content', ]) ->setRequired(['languageCode', 'mainLanguageCode']); } diff --git a/src/lib/Form/Type/FieldType/Author/AuthorEntryType.php b/src/lib/Form/Type/FieldType/Author/AuthorEntryType.php index c27e3ae3..b7be47b6 100644 --- a/src/lib/Form/Type/FieldType/Author/AuthorEntryType.php +++ b/src/lib/Form/Type/FieldType/Author/AuthorEntryType.php @@ -9,6 +9,7 @@ namespace Ibexa\ContentForms\Form\Type\FieldType\Author; use Ibexa\Core\FieldType\Author\Author; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; @@ -75,7 +76,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => Author::class, - 'translation_domain' => 'ezplatform_content_forms_fieldtype', + 'translation_domain' => 'ibexa_content_forms_fieldtype', ]); } } diff --git a/src/lib/Form/Type/FieldType/BinaryBaseFieldType.php b/src/lib/Form/Type/FieldType/BinaryBaseFieldType.php index 1f32facc..07454436 100644 --- a/src/lib/Form/Type/FieldType/BinaryBaseFieldType.php +++ b/src/lib/Form/Type/FieldType/BinaryBaseFieldType.php @@ -9,6 +9,7 @@ namespace Ibexa\ContentForms\Form\Type\FieldType; use Ibexa\ContentForms\ConfigResolver\MaxUploadSize; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\FileType; @@ -63,7 +64,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(['translation_domain' => 'ezplatform_content_forms_fieldtype']); + $resolver->setDefaults(['translation_domain' => 'ibexa_content_forms_fieldtype']); } } diff --git a/src/lib/Form/Type/FieldType/BinaryFileFieldType.php b/src/lib/Form/Type/FieldType/BinaryFileFieldType.php index c47c8224..c0f8adc8 100644 --- a/src/lib/Form/Type/FieldType/BinaryFileFieldType.php +++ b/src/lib/Form/Type/FieldType/BinaryFileFieldType.php @@ -33,7 +33,7 @@ public function getParent() public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(['translation_domain' => 'ezplatform_content_forms_fieldtype']); + $resolver->setDefaults(['translation_domain' => 'ibexa_content_forms_fieldtype']); } } diff --git a/src/lib/Form/Type/FieldType/ImageAssetFieldType.php b/src/lib/Form/Type/FieldType/ImageAssetFieldType.php index 8d90aafa..c4abd479 100644 --- a/src/lib/Form/Type/FieldType/ImageAssetFieldType.php +++ b/src/lib/Form/Type/FieldType/ImageAssetFieldType.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; use Ibexa\Core\FieldType\ImageAsset\AssetMapper; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\FileType; @@ -115,7 +116,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_fieldtype', + 'translation_domain' => 'ibexa_content_forms_fieldtype', ]); } diff --git a/src/lib/Form/Type/FieldType/ImageFieldType.php b/src/lib/Form/Type/FieldType/ImageFieldType.php index 9eaf8f07..eec047b3 100644 --- a/src/lib/Form/Type/FieldType/ImageFieldType.php +++ b/src/lib/Form/Type/FieldType/ImageFieldType.php @@ -9,6 +9,7 @@ namespace Ibexa\ContentForms\Form\Type\FieldType; use Ibexa\ContentForms\Form\Type\JsonArrayType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; @@ -63,7 +64,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_fieldtype', + 'translation_domain' => 'ibexa_content_forms_fieldtype', 'is_alternative_text_required' => false, ]); diff --git a/src/lib/Form/Type/FieldType/MapLocationFieldType.php b/src/lib/Form/Type/FieldType/MapLocationFieldType.php index 19318542..73c6df03 100644 --- a/src/lib/Form/Type/FieldType/MapLocationFieldType.php +++ b/src/lib/Form/Type/FieldType/MapLocationFieldType.php @@ -10,6 +10,7 @@ use Ibexa\ContentForms\FieldType\DataTransformer\FieldValueTransformer; use Ibexa\Contracts\Core\Repository\FieldTypeService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -94,7 +95,7 @@ public function finishView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(['translation_domain' => 'ezplatform_content_forms_fieldtype']); + $resolver->setDefaults(['translation_domain' => 'ibexa_content_forms_fieldtype']); } } diff --git a/src/lib/Form/Type/FieldType/MediaFieldType.php b/src/lib/Form/Type/FieldType/MediaFieldType.php index 575d9535..08ce6622 100644 --- a/src/lib/Form/Type/FieldType/MediaFieldType.php +++ b/src/lib/Form/Type/FieldType/MediaFieldType.php @@ -8,6 +8,7 @@ namespace Ibexa\ContentForms\Form\Type\FieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; @@ -91,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(['translation_domain' => 'ezplatform_content_forms_fieldtype']); + $resolver->setDefaults(['translation_domain' => 'ibexa_content_forms_fieldtype']); } } diff --git a/src/lib/Form/Type/FieldType/UrlFieldType.php b/src/lib/Form/Type/FieldType/UrlFieldType.php index a561a3d4..47fdf990 100644 --- a/src/lib/Form/Type/FieldType/UrlFieldType.php +++ b/src/lib/Form/Type/FieldType/UrlFieldType.php @@ -10,6 +10,7 @@ use Ibexa\ContentForms\FieldType\DataTransformer\FieldValueTransformer; use Ibexa\Contracts\Core\Repository\FieldTypeService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\UrlType; @@ -64,7 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_fieldtype', + 'translation_domain' => 'ibexa_content_forms_fieldtype', ]); } } diff --git a/src/lib/Form/Type/FieldType/UserAccountFieldType.php b/src/lib/Form/Type/FieldType/UserAccountFieldType.php index 32475a77..d41c9a4b 100644 --- a/src/lib/Form/Type/FieldType/UserAccountFieldType.php +++ b/src/lib/Form/Type/FieldType/UserAccountFieldType.php @@ -10,6 +10,7 @@ use Ibexa\ContentForms\Data\User\UserAccountFieldData; use Ibexa\ContentForms\Form\Type\SwitcherType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\Extension\Core\Type\PasswordType; @@ -68,7 +69,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver ->setDefaults([ 'data_class' => UserAccountFieldData::class, - 'translation_domain' => 'ezplatform_content_forms_fieldtype', + 'translation_domain' => 'ibexa_content_forms_fieldtype', ]) ->setRequired(['intent']) ->setAllowedValues('intent', ['register', 'create', 'update', 'invitation']); diff --git a/src/lib/Form/Type/User/BaseUserType.php b/src/lib/Form/Type/User/BaseUserType.php index 43aff243..bfc24aea 100644 --- a/src/lib/Form/Type/User/BaseUserType.php +++ b/src/lib/Form/Type/User/BaseUserType.php @@ -11,6 +11,7 @@ use Ibexa\ContentForms\Form\EventSubscriber\SuppressValidationSubscriber; use Ibexa\ContentForms\Form\EventSubscriber\UserFieldsSubscriber; use Ibexa\ContentForms\Form\Type\Content\BaseContentType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -53,7 +54,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_user', + 'translation_domain' => 'ibexa_content_forms_user', ]) ->setRequired([ 'languageCode', diff --git a/src/lib/Form/Type/User/UserCreateType.php b/src/lib/Form/Type/User/UserCreateType.php index 7669cb9d..3d9f8b44 100644 --- a/src/lib/Form/Type/User/UserCreateType.php +++ b/src/lib/Form/Type/User/UserCreateType.php @@ -9,6 +9,7 @@ namespace Ibexa\ContentForms\Form\Type\User; use Ibexa\ContentForms\Data\User\UserCreateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -48,7 +49,7 @@ public function configureOptions(OptionsResolver $resolver) ->setDefaults([ 'data_class' => UserCreateData::class, 'intent' => 'create', - 'translation_domain' => 'ezplatform_content_forms_user', + 'translation_domain' => 'ibexa_content_forms_user', ]); } } diff --git a/src/lib/Form/Type/User/UserUpdateType.php b/src/lib/Form/Type/User/UserUpdateType.php index 908b1d87..5b3af50d 100644 --- a/src/lib/Form/Type/User/UserUpdateType.php +++ b/src/lib/Form/Type/User/UserUpdateType.php @@ -9,6 +9,7 @@ namespace Ibexa\ContentForms\Form\Type\User; use Ibexa\ContentForms\Data\User\UserUpdateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -49,7 +50,7 @@ public function configureOptions(OptionsResolver $resolver) 'location' => null, 'data_class' => UserUpdateData::class, 'intent' => 'update', - 'translation_domain' => 'ezplatform_content_forms_user', + 'translation_domain' => 'ibexa_content_forms_user', ]); } }