Renamed domain names

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'));

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'
                 );
             }
         }

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'));

src/bundle/Resources/translations/user_settings.en.xliff → src/bundle/Resources/translations/ibexa_user_settings.en.xliff

@@ -147,8 +147,8 @@
         <note>key: settings.timezone.value.title</note>
       </trans-unit>
       <trans-unit id="7f90e23e086f56c5f7b4a82c6e4b8f40732e6e6a" resname="user_setting.update.success">
-        <source>User setting '%identifier%' updated.</source>
-        <target state="new">User setting '%identifier%' updated.</target>
+        <source>User settings '%identifier%' updated.</source>
+        <target state="new">User settings '%identifier%' updated.</target>
         <note>key: user_setting.update.success</note>
       </trans-unit>
     </body>

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) }}

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

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 %}
     <h2>{{ 'ezplatform.forgot_password.reset_your_password'|trans|desc('Reset your password') }}</h2>

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 -%}

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

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 -%}
     <h2>{{ 'ezplatform.forgot_password.reset_your_password'|trans|desc('Reset your password') }}</h2>

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 -%}

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 %}
     <h1>{{ 'ezplatform.registration_confirmation.header'|trans|desc('Your account has been created') }}</h1>

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 -%}
     <h2 class="ibexa-login__header">{{ 'ezplatform.reset_password.change_password'|trans|desc('Change password') }}</h2>

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 -%}
     <h2 class="ibexa-login__header">{{ 'ezplatform.reset_password.change_password'|trans|desc('Change password') }}</h2>

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 -%}
     <h2>{{ 'ezplatform.reset_password.change_password'|trans|desc('Change password') }}</h2>

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 %}

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) }}

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',
         ]);
     }
 }

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'
         );
     }
 }

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'
         );
     }
 }