diff --git a/src/bundle/Controller/PasswordChangeController.php b/src/bundle/Controller/PasswordChangeController.php index dad74d0..114d26d 100644 --- a/src/bundle/Controller/PasswordChangeController.php +++ b/src/bundle/Controller/PasswordChangeController.php @@ -15,6 +15,7 @@ use Ibexa\User\Form\Factory\FormFactory; use Ibexa\User\View\ChangePassword\FormView; use Ibexa\User\View\ChangePassword\SuccessView; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; @@ -75,7 +76,7 @@ public function userPasswordChangeAction(Request $request) /** @Desc("Your password has been successfully changed.") */ 'ezplatform.change_password.success', [], - 'change_password' + 'ibexa_change_password' ); return new RedirectResponse($this->generateUrl('ibexa.dashboard')); diff --git a/src/bundle/Controller/UserInvitationController.php b/src/bundle/Controller/UserInvitationController.php index 3fc6dd8..5306fb2 100644 --- a/src/bundle/Controller/UserInvitationController.php +++ b/src/bundle/Controller/UserInvitationController.php @@ -16,6 +16,7 @@ use Ibexa\User\ExceptionHandler\ActionResultHandler; use Ibexa\User\Form\Type\Invitation\UserInvitationType; use Ibexa\User\View\Invitation\FormView; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; @@ -66,21 +67,21 @@ public function inviteUser(Request $request): FormView /** @Desc("Invitation sent to '%email%' updated.") */ 'user_invitation.send.success', ['%email%' => $data->getEmail()], - 'user_invitation' + 'ibexa_user_invitation' ); } catch (InvitationAlreadyExistsException $e) { $this->actionResultHandler->error( /** @Desc("Invitation for '%email%' already exists.") */ 'user_invitation.send.invitation_exist', ['%email%' => $data->getEmail()], - 'user_invitation' + 'ibexa_user_invitation' ); } catch (UserAlreadyExistsException $e) { $this->actionResultHandler->error( /** @Desc("User with '%email%' already exists.") */ 'user_invitation.send.user_exist', ['%email%' => $data->getEmail()], - 'user_invitation' + 'ibexa_user_invitation' ); } } diff --git a/src/bundle/Controller/UserSettingsController.php b/src/bundle/Controller/UserSettingsController.php index 4075c55..881d1a9 100644 --- a/src/bundle/Controller/UserSettingsController.php +++ b/src/bundle/Controller/UserSettingsController.php @@ -17,6 +17,7 @@ use Ibexa\User\UserSetting\ValueDefinitionRegistry; use Ibexa\User\View\UserSettings\ListView; use Ibexa\User\View\UserSettings\UpdateView; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -95,7 +96,7 @@ public function updateAction(Request $request, UpdateView $view) /** @Desc("User settings '%identifier%' updated.") */ 'user_setting.update.success', ['%identifier%' => $data->getIdentifier()], - 'user_settings' + 'ibexa_user_settings' ); return new RedirectResponse($this->generateUrl('ibexa.user_settings.list')); diff --git a/src/bundle/Resources/translations/change_password.en.xliff b/src/bundle/Resources/translations/ibexa_change_password.en.xliff similarity index 100% rename from src/bundle/Resources/translations/change_password.en.xliff rename to src/bundle/Resources/translations/ibexa_change_password.en.xliff diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff similarity index 100% rename from src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff rename to src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_user_registration.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_user_registration.en.xliff similarity index 100% rename from src/bundle/Resources/translations/ezplatform_content_forms_user_registration.en.xliff rename to src/bundle/Resources/translations/ibexa_content_forms_user_registration.en.xliff diff --git a/src/bundle/Resources/translations/forgot_password.en.xliff b/src/bundle/Resources/translations/ibexa_forgot_password.en.xliff similarity index 100% rename from src/bundle/Resources/translations/forgot_password.en.xliff rename to src/bundle/Resources/translations/ibexa_forgot_password.en.xliff diff --git a/src/bundle/Resources/translations/registration.en.xliff b/src/bundle/Resources/translations/ibexa_registration.en.xliff similarity index 100% rename from src/bundle/Resources/translations/registration.en.xliff rename to src/bundle/Resources/translations/ibexa_registration.en.xliff diff --git a/src/bundle/Resources/translations/reset_password.en.xliff b/src/bundle/Resources/translations/ibexa_reset_password.en.xliff similarity index 100% rename from src/bundle/Resources/translations/reset_password.en.xliff rename to src/bundle/Resources/translations/ibexa_reset_password.en.xliff diff --git a/src/bundle/Resources/translations/user_invitation.en.xliff b/src/bundle/Resources/translations/ibexa_user_invitation.en.xliff similarity index 100% rename from src/bundle/Resources/translations/user_invitation.en.xliff rename to src/bundle/Resources/translations/ibexa_user_invitation.en.xliff diff --git a/src/bundle/Resources/translations/user_settings.en.xliff b/src/bundle/Resources/translations/ibexa_user_settings.en.xliff similarity index 100% rename from src/bundle/Resources/translations/user_settings.en.xliff rename to src/bundle/Resources/translations/ibexa_user_settings.en.xliff diff --git a/src/bundle/Resources/translations/menu.en.xliff b/src/bundle/Resources/translations/menu.en.xliff deleted file mode 100644 index 129ea9b..0000000 --- a/src/bundle/Resources/translations/menu.en.xliff +++ /dev/null @@ -1,26 +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. -
- - - Change password - Change password - key: user__change_password - - - Discard changes - Discard changes - key: user_password_change__sidebar_right__cancel - - - Update - Update - key: user_password_change__sidebar_right__update - - - - diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff deleted file mode 100644 index b3bb3c7..0000000 --- a/src/bundle/Resources/translations/messages.en.xliff +++ /dev/null @@ -1,68 +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. -
- - - Reset your password - Reset your password - key: authentication.reset_your_password - - - If you do not remember your login, please contact the site administrator. - If you do not remember your login, please contact the site administrator. - key: ezplatform.forgot_user_password.contact_administrator - - - This email is connected with several accounts. Please enter your login. - This email is connected with several accounts. Please enter your login. - key: ezplatform.forgot_user_password.login - - -
- We have received a request to reset the password for your account on site. Click “reset password” below to choose a new password: -

- Reset password -

- If you did not request a password reset, please ignore this email, and your password will remain the same.]]> -
- We have received a request to reset the password for your account on site. Click “reset password” below to choose a new password: -

- Reset password -

- If you did not request a password reset, please ignore this email, and your password will remain the same.]]> - key: ezplatform.forgot_user_password.message - - - Reset your password - Reset your password - key: ezplatform.forgot_user_password.reset_your_password - - - If you don’t receive the email, double check that you entered the correct email address and check your spam folder.

]]> - If you don’t receive the email, double check that you entered the correct email address and check your spam folder.

]]> - key: ezplatform.forgot_user_password.success - - - Change password - Change password - key: ezplatform.reset_user_password.change_password - - - generate a new link to reset your password.]]> - generate a new link to reset your password.]]> - key: ezplatform.reset_user_password.link_is_not_valid - - - login to eZ Platform.]]> - login to eZ Platform.]]> - key: ezplatform.reset_user_password.success - - - - diff --git a/src/bundle/Resources/translations/pagination.en.xliff b/src/bundle/Resources/translations/pagination.en.xliff deleted file mode 100644 index f12b710..0000000 --- a/src/bundle/Resources/translations/pagination.en.xliff +++ /dev/null @@ -1,16 +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. -
- - - Viewing %viewing% out of %total% items - Viewing %viewing% out of %total% items - key: pagination.viewing - - - - diff --git a/src/bundle/Resources/translations/user_change_password.en.xliff b/src/bundle/Resources/translations/user_change_password.en.xliff deleted file mode 100644 index 6e099bb..0000000 --- a/src/bundle/Resources/translations/user_change_password.en.xliff +++ /dev/null @@ -1,16 +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. -
- - - Your password has been successfully changed. - Your password has been successfully changed. - key: user.change_password.success - - - - diff --git a/src/bundle/Resources/views/change_password/index.html.twig b/src/bundle/Resources/views/change_password/index.html.twig index f30bf3b..bdb4cf5 100644 --- a/src/bundle/Resources/views/change_password/index.html.twig +++ b/src/bundle/Resources/views/change_password/index.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'change_password' %} +{% trans_default_domain 'ibexa_change_password' %} {% block content %} {{ form_start(form_change_user_password) }} diff --git a/src/bundle/Resources/views/change_password/success.html.twig b/src/bundle/Resources/views/change_password/success.html.twig index 8728c21..0f64341 100644 --- a/src/bundle/Resources/views/change_password/success.html.twig +++ b/src/bundle/Resources/views/change_password/success.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'change_password' %} +{% trans_default_domain 'ibexa_change_password' %} {%- block content -%} {{ 'ezplatform.change_password.success'|trans|raw diff --git a/src/bundle/Resources/views/forgot_password/index.html.twig b/src/bundle/Resources/views/forgot_password/index.html.twig index 0a8ea30..b5cc623 100644 --- a/src/bundle/Resources/views/forgot_password/index.html.twig +++ b/src/bundle/Resources/views/forgot_password/index.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'forgot_password' %} +{% trans_default_domain 'ibexa_forgot_password' %} {% block content %}

{{ 'ezplatform.forgot_password.reset_your_password'|trans|desc('Reset your password') }}

diff --git a/src/bundle/Resources/views/forgot_password/mail/forgot_user_password.html.twig b/src/bundle/Resources/views/forgot_password/mail/forgot_user_password.html.twig index 4e9e22e..94fd30d 100644 --- a/src/bundle/Resources/views/forgot_password/mail/forgot_user_password.html.twig +++ b/src/bundle/Resources/views/forgot_password/mail/forgot_user_password.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'forgot_password' %} +{% trans_default_domain 'ibexa_forgot_password' %} {%- block from -%} {%- endblock from -%} diff --git a/src/bundle/Resources/views/forgot_password/success.html.twig b/src/bundle/Resources/views/forgot_password/success.html.twig index 7eb1ff4..34b5f00 100644 --- a/src/bundle/Resources/views/forgot_password/success.html.twig +++ b/src/bundle/Resources/views/forgot_password/success.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'forgot_password' %} +{% trans_default_domain 'ibexa_forgot_password' %} {%- block content -%} {{ 'ezplatform.forgot_password.success'|trans|raw diff --git a/src/bundle/Resources/views/forgot_password/with_login.html.twig b/src/bundle/Resources/views/forgot_password/with_login.html.twig index 24ba1d2..c6d400a 100644 --- a/src/bundle/Resources/views/forgot_password/with_login.html.twig +++ b/src/bundle/Resources/views/forgot_password/with_login.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'forgot_password' %} +{% trans_default_domain 'ibexa_forgot_password' %} {%- block content -%}

{{ 'ezplatform.forgot_password.reset_your_password'|trans|desc('Reset your password') }}

diff --git a/src/bundle/Resources/views/invitation/mail/user_invitation.html.twig b/src/bundle/Resources/views/invitation/mail/user_invitation.html.twig index 7b50289..1b44687 100644 --- a/src/bundle/Resources/views/invitation/mail/user_invitation.html.twig +++ b/src/bundle/Resources/views/invitation/mail/user_invitation.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'user_invitation' %} +{% trans_default_domain 'ibexa_user_invitation' %} {%- block from -%} {%- endblock from -%} diff --git a/src/bundle/Resources/views/register/register_confirmation.html.twig b/src/bundle/Resources/views/register/register_confirmation.html.twig index 3edf0e5..e58fcbe 100644 --- a/src/bundle/Resources/views/register/register_confirmation.html.twig +++ b/src/bundle/Resources/views/register/register_confirmation.html.twig @@ -1,6 +1,6 @@ {% extends no_layout is defined and no_layout == true ? view_base_layout : page_layout %} -{% trans_default_domain 'registration' %} +{% trans_default_domain 'ibexa_registration' %} {% block content %}

{{ 'ezplatform.registration_confirmation.header'|trans|desc('Your account has been created') }}

diff --git a/src/bundle/Resources/views/reset_password/index.html.twig b/src/bundle/Resources/views/reset_password/index.html.twig index e1de420..2a8b6b1 100644 --- a/src/bundle/Resources/views/reset_password/index.html.twig +++ b/src/bundle/Resources/views/reset_password/index.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'reset_password' %} +{% trans_default_domain 'ibexa_reset_password' %} {%- block content -%}

{{ 'ezplatform.reset_password.change_password'|trans|desc('Change password') }}

diff --git a/src/bundle/Resources/views/reset_password/invalid_link.html.twig b/src/bundle/Resources/views/reset_password/invalid_link.html.twig index 9bd5140..b6616c3 100644 --- a/src/bundle/Resources/views/reset_password/invalid_link.html.twig +++ b/src/bundle/Resources/views/reset_password/invalid_link.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'reset_password' %} +{% trans_default_domain 'ibexa_reset_password' %} {%- block content -%}

{{ 'ezplatform.reset_password.change_password'|trans|desc('Change password') }}

diff --git a/src/bundle/Resources/views/reset_password/success.html.twig b/src/bundle/Resources/views/reset_password/success.html.twig index 6b82126..0315c57 100644 --- a/src/bundle/Resources/views/reset_password/success.html.twig +++ b/src/bundle/Resources/views/reset_password/success.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'reset_password' %} +{% trans_default_domain 'ibexa_reset_password' %} {%- block content -%}

{{ 'ezplatform.reset_password.change_password'|trans|desc('Change password') }}

diff --git a/src/bundle/Resources/views/user_settings/list.html.twig b/src/bundle/Resources/views/user_settings/list.html.twig index cfbf790..7fe6787 100644 --- a/src/bundle/Resources/views/user_settings/list.html.twig +++ b/src/bundle/Resources/views/user_settings/list.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'user_settings' %} +{% trans_default_domain 'ibexa_user_settings' %} {%- block content -%} {% for settings_group in grouped_settings %} diff --git a/src/bundle/Resources/views/user_settings/update.html.twig b/src/bundle/Resources/views/user_settings/update.html.twig index e4dd9ca..09f896b 100644 --- a/src/bundle/Resources/views/user_settings/update.html.twig +++ b/src/bundle/Resources/views/user_settings/update.html.twig @@ -1,6 +1,6 @@ {% extends view_base_layout is defined ? view_base_layout : page_layout %} -{% trans_default_domain 'user_settings' %} +{% trans_default_domain 'ibexa_user_settings' %} {% block content %} {{ form_start(form) }} diff --git a/src/lib/Form/Type/UserRegisterType.php b/src/lib/Form/Type/UserRegisterType.php index 861d6d9..101bf8b 100644 --- a/src/lib/Form/Type/UserRegisterType.php +++ b/src/lib/Form/Type/UserRegisterType.php @@ -10,6 +10,7 @@ use Ibexa\ContentForms\Form\Type\Content\BaseContentType; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\User\Form\Data\UserRegisterData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -75,7 +76,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver ->setDefaults([ 'data_class' => UserRegisterData::class, - 'translation_domain' => 'ezplatform_content_forms_user_registration', + 'translation_domain' => 'ibexa_content_forms_user_registration', 'intent' => 'register', ]) ->setRequired(['languageCode']); diff --git a/src/lib/Form/Type/UserSettings/DateTimeFormatType.php b/src/lib/Form/Type/UserSettings/DateTimeFormatType.php index 75354ab..0de2e46 100644 --- a/src/lib/Form/Type/UserSettings/DateTimeFormatType.php +++ b/src/lib/Form/Type/UserSettings/DateTimeFormatType.php @@ -8,6 +8,7 @@ namespace Ibexa\User\Form\Type\UserSettings; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; @@ -43,7 +44,7 @@ public function configureOptions(OptionsResolver $resolver): void $resolver->setDefaults([ 'date_format_choices' => [], 'time_format_choices' => [], - 'translation_domain' => 'user_settings', + 'translation_domain' => 'ibexa_user_settings', ]); } } diff --git a/src/lib/Permission/UserPermissionsLimitation.php b/src/lib/Permission/UserPermissionsLimitation.php index 985063a..2a6d9ee 100644 --- a/src/lib/Permission/UserPermissionsLimitation.php +++ b/src/lib/Permission/UserPermissionsLimitation.php @@ -29,7 +29,7 @@ public static function getTranslationMessages(): array return [ (new Message( 'policy.limitation.identifier.userpermissions', - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' ))->setDesc('Roles and/or User Groups'), ]; } diff --git a/src/lib/UserSetting/Group/BrowsingGroup.php b/src/lib/UserSetting/Group/BrowsingGroup.php index aca756c..4a04dca 100644 --- a/src/lib/UserSetting/Group/BrowsingGroup.php +++ b/src/lib/UserSetting/Group/BrowsingGroup.php @@ -8,6 +8,7 @@ namespace Ibexa\User\UserSetting\Group; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Contracts\Translation\TranslatorInterface; final class BrowsingGroup extends AbstractGroup @@ -28,7 +29,7 @@ public function getName(): string /** @Desc("Browsing") */ 'settings.group.browsing.name', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -38,7 +39,7 @@ public function getDescription(): string /** @Desc("") */ 'settings.group.browsing.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Group/CustomGroup.php b/src/lib/UserSetting/Group/CustomGroup.php index aa3b8c8..649fe9e 100644 --- a/src/lib/UserSetting/Group/CustomGroup.php +++ b/src/lib/UserSetting/Group/CustomGroup.php @@ -8,6 +8,7 @@ namespace Ibexa\User\UserSetting\Group; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Contracts\Translation\TranslatorInterface; final class CustomGroup extends AbstractGroup @@ -30,7 +31,7 @@ public function getName(): string /** @Desc("Custom Group") */ 'settings.group.generic.name', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -40,7 +41,7 @@ public function getDescription(): string /** @Desc("") */ 'settings.group.generic.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Group/EditContentGroup.php b/src/lib/UserSetting/Group/EditContentGroup.php index 77ea3b7..dcfcdb6 100644 --- a/src/lib/UserSetting/Group/EditContentGroup.php +++ b/src/lib/UserSetting/Group/EditContentGroup.php @@ -8,6 +8,7 @@ namespace Ibexa\User\UserSetting\Group; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Contracts\Translation\TranslatorInterface; final class EditContentGroup extends AbstractGroup @@ -28,7 +29,7 @@ public function getName(): string /** @Desc("Edit") */ 'settings.group.edit_content.name', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -38,7 +39,7 @@ public function getDescription(): string /** @Desc("") */ 'settings.group.edit_content.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Group/LocationGroup.php b/src/lib/UserSetting/Group/LocationGroup.php index ed8cd4f..b30c7da 100644 --- a/src/lib/UserSetting/Group/LocationGroup.php +++ b/src/lib/UserSetting/Group/LocationGroup.php @@ -8,6 +8,7 @@ namespace Ibexa\User\UserSetting\Group; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Contracts\Translation\TranslatorInterface; final class LocationGroup extends AbstractGroup @@ -28,7 +29,7 @@ public function getName(): string /** @Desc("Location") */ 'settings.group.location.name', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -38,7 +39,7 @@ public function getDescription(): string /** @Desc("") */ 'settings.group.location.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Setting/CharacterCounter.php b/src/lib/UserSetting/Setting/CharacterCounter.php index ab2ac34..9ddbaed 100644 --- a/src/lib/UserSetting/Setting/CharacterCounter.php +++ b/src/lib/UserSetting/Setting/CharacterCounter.php @@ -11,6 +11,7 @@ use Ibexa\Contracts\User\UserSetting\FormMapperInterface; use Ibexa\Contracts\User\UserSetting\ValueDefinitionInterface; use Ibexa\Core\Base\Exceptions\InvalidArgumentException; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -104,7 +105,7 @@ private function getTranslatedName(): string /** @Desc("Character counter") */ 'settings.character_counter.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -117,7 +118,7 @@ private function getTranslatedDescription(): string /** @Desc("Enable character count in Online Editor") */ 'settings.character_counter.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -130,7 +131,7 @@ private function getTranslatedOptionEnabled(): string /** @Desc("enabled") */ 'settings.character_counter.value.enabled', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -143,7 +144,7 @@ private function getTranslatedOptionDisabled(): string /** @Desc("disabled") */ 'settings.character_counter.value.disabled', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Setting/FullDateTimeFormat.php b/src/lib/UserSetting/Setting/FullDateTimeFormat.php index 108e0e4..cf372a7 100644 --- a/src/lib/UserSetting/Setting/FullDateTimeFormat.php +++ b/src/lib/UserSetting/Setting/FullDateTimeFormat.php @@ -14,6 +14,7 @@ use Ibexa\User\Form\Type\UserSettings\FullDateTimeFormatType; use Ibexa\User\UserSetting\DateTimeFormat\FormatterInterface; use Ibexa\User\UserSetting\Setting\Value\DateTimeFormat; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -84,7 +85,7 @@ protected function getTranslatedName(): string /** @Desc("Long date and time format") */ 'settings.full_datetime_format.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -97,7 +98,7 @@ protected function getTranslatedDescription(): string /** @Desc("Date and time format") */ 'settings.full_datetime_format.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } diff --git a/src/lib/UserSetting/Setting/Language.php b/src/lib/UserSetting/Setting/Language.php index deba324..713563c 100644 --- a/src/lib/UserSetting/Setting/Language.php +++ b/src/lib/UserSetting/Setting/Language.php @@ -12,6 +12,7 @@ use Ibexa\Contracts\User\UserSetting\ValueDefinitionInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Ibexa\User\Form\ChoiceList\Loader\AvailableLocaleChoiceLoader; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\LocaleType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -101,7 +102,7 @@ private function getTranslatedName(): string /** @Desc("Language") */ 'settings.language.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -114,7 +115,7 @@ private function getTranslatedDescription(): string /** @Desc("Language") */ 'settings.language.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Setting/ShortDateTimeFormat.php b/src/lib/UserSetting/Setting/ShortDateTimeFormat.php index 66bdd97..dbf35ca 100644 --- a/src/lib/UserSetting/Setting/ShortDateTimeFormat.php +++ b/src/lib/UserSetting/Setting/ShortDateTimeFormat.php @@ -14,6 +14,7 @@ use Ibexa\User\Form\Type\UserSettings\ShortDateTimeFormatType; use Ibexa\User\UserSetting\DateTimeFormat\FormatterInterface; use Ibexa\User\UserSetting\Setting\Value\DateTimeFormat; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -83,7 +84,7 @@ protected function getTranslatedName(): string /** @Desc("Short date and time format") */ 'settings.short_datetime_format.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -96,7 +97,7 @@ protected function getTranslatedDescription(): string /** @Desc("Date and time format") */ 'settings.short_datetime_format.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } diff --git a/src/lib/UserSetting/Setting/SubitemsLimit.php b/src/lib/UserSetting/Setting/SubitemsLimit.php index 5cb3f1a..e177800 100644 --- a/src/lib/UserSetting/Setting/SubitemsLimit.php +++ b/src/lib/UserSetting/Setting/SubitemsLimit.php @@ -11,6 +11,7 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Contracts\User\UserSetting\FormMapperInterface; use Ibexa\Contracts\User\UserSetting\ValueDefinitionInterface; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -86,7 +87,7 @@ private function getTranslatedName(): string /** @Desc("Sub-items") */ 'settings.subitems_limit.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -99,7 +100,7 @@ private function getTranslatedDescription(): string /** @Desc("Number of items displayed in the table") */ 'settings.subitems_limit.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/Setting/Timezone.php b/src/lib/UserSetting/Setting/Timezone.php index 313200e..070c615 100644 --- a/src/lib/UserSetting/Setting/Timezone.php +++ b/src/lib/UserSetting/Setting/Timezone.php @@ -10,6 +10,7 @@ use Ibexa\Contracts\User\UserSetting\FormMapperInterface; use Ibexa\Contracts\User\UserSetting\ValueDefinitionInterface; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\TimezoneType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -84,7 +85,7 @@ private function getTranslatedName(): string /** @Desc("Time Zone") */ 'settings.timezone.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -97,7 +98,7 @@ private function getTranslatedDescription(): string /** @Desc("User Time Zone") */ 'settings.timezone.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } }