Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed domain names #60

Merged
merged 3 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/bundle/Controller/PasswordChangeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'));
Expand Down
7 changes: 4 additions & 3 deletions src/bundle/Controller/UserInvitationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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'
);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/bundle/Controller/UserSettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'));
Expand Down
26 changes: 0 additions & 26 deletions src/bundle/Resources/translations/menu.en.xliff

This file was deleted.

68 changes: 0 additions & 68 deletions src/bundle/Resources/translations/messages.en.xliff

This file was deleted.

16 changes: 0 additions & 16 deletions src/bundle/Resources/translations/pagination.en.xliff

This file was deleted.

16 changes: 0 additions & 16 deletions src/bundle/Resources/translations/user_change_password.en.xliff

This file was deleted.

2 changes: 1 addition & 1 deletion src/bundle/Resources/views/change_password/index.html.twig
Original file line number Diff line number Diff line change
@@ -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) }}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/forgot_password/index.html.twig
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% trans_default_domain 'forgot_password' %}
{% trans_default_domain 'ibexa_forgot_password' %}

{%- block from -%}
{%- endblock from -%}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% trans_default_domain 'user_invitation' %}
{% trans_default_domain 'ibexa_user_invitation' %}

{%- block from -%}
{%- endblock from -%}
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/reset_password/index.html.twig
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/user_settings/list.html.twig
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/user_settings/update.html.twig
Original file line number Diff line number Diff line change
@@ -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) }}
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Form/Type/UserRegisterType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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']);
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Form/Type/UserSettings/DateTimeFormatType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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',
]);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Permission/UserPermissionsLimitation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
];
}
Expand Down
5 changes: 3 additions & 2 deletions src/lib/UserSetting/Group/BrowsingGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Ibexa\User\UserSetting\Group;

use JMS\TranslationBundle\Annotation\Desc;
use Symfony\Contracts\Translation\TranslatorInterface;

final class BrowsingGroup extends AbstractGroup
Expand All @@ -28,7 +29,7 @@ public function getName(): string
/** @Desc("Browsing") */
'settings.group.browsing.name',
[],
'user_settings'
'ibexa_user_settings'
);
}

Expand All @@ -38,7 +39,7 @@ public function getDescription(): string
/** @Desc("") */
'settings.group.browsing.description',
[],
'user_settings'
'ibexa_user_settings'
);
}
}
5 changes: 3 additions & 2 deletions src/lib/UserSetting/Group/CustomGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Ibexa\User\UserSetting\Group;

use JMS\TranslationBundle\Annotation\Desc;
use Symfony\Contracts\Translation\TranslatorInterface;

final class CustomGroup extends AbstractGroup
Expand All @@ -30,7 +31,7 @@ public function getName(): string
/** @Desc("Custom Group") */
'settings.group.generic.name',
[],
'user_settings'
'ibexa_user_settings'
);
}

Expand All @@ -40,7 +41,7 @@ public function getDescription(): string
/** @Desc("") */
'settings.group.generic.description',
[],
'user_settings'
'ibexa_user_settings'
);
}
}
Loading