diff --git a/src/bundle/Controller/AssetController.php b/src/bundle/Controller/AssetController.php index f2dca01198..f4519314b4 100644 --- a/src/bundle/Controller/AssetController.php +++ b/src/bundle/Controller/AssetController.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Core\FieldType\Image\Value as ImageValue; use Ibexa\Core\FieldType\ImageAsset\AssetMapper as ImageAssetMapper; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -118,7 +119,7 @@ private function createInvalidCsrfResponse(): JsonResponse /** @Desc("Missing or invalid CSRF token") */ 'asset.upload.invalid_csrf', [], - 'assets' + 'ibexa_admin_ui' ); return $this->createGenericErrorResponse($errorMessage); diff --git a/src/bundle/Controller/Content/VersionDraftConflictController.php b/src/bundle/Controller/Content/VersionDraftConflictController.php index fb9a02293a..e3d137458c 100644 --- a/src/bundle/Controller/Content/VersionDraftConflictController.php +++ b/src/bundle/Controller/Content/VersionDraftConflictController.php @@ -16,6 +16,7 @@ use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\UserService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\Response; use Symfony\Contracts\Translation\TranslatorInterface; @@ -83,7 +84,7 @@ public function draftHasNoConflictAction( /** @Desc("Cannot check if the draft has conflicts with other drafts. %error%.") */ 'content.draft.conflict.error', ['%error%' => $e->getMessage()], - 'content' + 'ibexa_content' ); return new Response($error, Response::HTTP_FORBIDDEN); diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php index d6aab76906..6dd9009c53 100644 --- a/src/bundle/Controller/ContentController.php +++ b/src/bundle/Controller/ContentController.php @@ -39,6 +39,7 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Base\Exceptions\BadStateException; use Ibexa\Core\Helper\TranslationHelper; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -242,7 +243,7 @@ public function editAction(Request $request): Response /** @Desc("Created a new draft for '%name%'.") */ 'content.create_draft.success', ['%name%' => $this->translationHelper->getTranslatedContentName($content)], - 'content' + 'ibexa_content' ); } @@ -304,7 +305,7 @@ public function updateMainLocationAction(Request $request): Response /** @Desc("Main Location for '%name%' updated.") */ 'content.main_location_update.success', ['%name%' => $contentInfo->name], - 'content' + 'ibexa_content' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ @@ -408,7 +409,7 @@ public function updateMainTranslationAction(Request $request): Response /** @Desc("Main language for '%name%' updated.") */ 'content.main_language_update.success', ['%name%' => $this->translationHelper->getTranslatedContentName($content)], - 'content' + 'ibexa_content' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ @@ -459,7 +460,7 @@ public function updateVisibilityAction(Request $request): Response /** @Desc("Content item '%name%' is already hidden.") */ 'content.hide.already_hidden', ['%name%' => $contentName], - 'content' + 'ibexa_content' ); } @@ -468,7 +469,7 @@ public function updateVisibilityAction(Request $request): Response /** @Desc("Content item '%name%' is already visible.") */ 'content.reveal.already_visible', ['%name%' => $contentName], - 'content' + 'ibexa_content' ); } @@ -479,7 +480,7 @@ public function updateVisibilityAction(Request $request): Response /** @Desc("Content item '%name%' hidden.") */ 'content.hide.success', ['%name%' => $contentName], - 'content' + 'ibexa_content' ); } @@ -490,7 +491,7 @@ public function updateVisibilityAction(Request $request): Response /** @Desc("Content item '%name%' revealed.") */ 'content.reveal.success', ['%name%' => $contentName], - 'content' + 'ibexa_content' ); } diff --git a/src/bundle/Controller/ContentTypeController.php b/src/bundle/Controller/ContentTypeController.php index 2d1cae44b0..4cd98227ff 100644 --- a/src/bundle/Controller/ContentTypeController.php +++ b/src/bundle/Controller/ContentTypeController.php @@ -38,6 +38,7 @@ use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\Form\FormInterface; @@ -208,7 +209,7 @@ public function addAction(ContentTypeGroup $group) /** @Desc("Cannot create Content Type. Could not find language with identifier '%languageCode%'") */ 'content_type.add.missing_language', ['%languageCode%' => $mainLanguageCode], - 'content_type' + 'ibexa_content_type' ); return $this->redirectToRoute('ibexa.content_type_group.view', [ @@ -258,7 +259,7 @@ public function addTranslationAction(Request $request): Response /** @Desc("Draft of Content Type '%name%' already exists and is locked by '%userContentName%'") */ 'content_type.edit.error.already_exists', ['%name%' => $contentType->getName(), '%userContentName%' => $this->getUserNameById($userId)], - 'content_type' + 'ibexa_content_type' ); return $this->redirectToRoute('ibexa.content_type.view', [ @@ -316,7 +317,7 @@ public function removeTranslationAction(Request $request): Response /** @Desc("Draft of Content Type '%name%' already exists and is locked by '%userContentName%'") */ 'content_type.edit.error.already_exists', ['%name%' => $contentType->getName(), '%userContentName%' => $this->getUserNameById($userId)], - 'content_type' + 'ibexa_content_type' ); return $this->redirectToRoute('ibexa.content_type.view', [ @@ -371,7 +372,7 @@ public function editAction(Request $request, ContentTypeGroup $group, ContentTyp /** @Desc("Draft of Content Type '%name%' already exists and is locked by '%userContentName%'") */ 'content_type.edit.error.already_exists', ['%name%' => $contentType->getName(), '%userContentName%' => $this->getUserNameById($contentTypeDraft->modifierId)], - 'content_type' + 'ibexa_content_type' ) ); @@ -444,14 +445,14 @@ public function copyAction(Request $request, ContentTypeGroup $group, ContentTyp /** @Desc("Content Type '%name%' copied.") */ 'content_type.copy.success', ['%name%' => $contentType->getName()], - 'content_type' + 'ibexa_content_type' ); } catch (UnauthorizedException $exception) { $notificationHandler->error( /** @Desc("Content Type '%name%' cannot be copied.") */ 'content_type.copy.error', ['%name%' => $contentType->getName()], - 'content_type' + 'ibexa_content_type' ); } @@ -519,7 +520,7 @@ public function updateAction( /** @Desc("Content Type '%name%' updated.") */ 'content_type.update.success', ['%name%' => $contentTypeDraft->getName()], - 'content_type' + 'ibexa_content_type' ); if ($action === self::PRIMARY_UPDATE_ACTION) { @@ -620,7 +621,7 @@ public function deleteAction(Request $request, ContentTypeGroup $group, ContentT /** @Desc("Content Type '%name%' deleted.") */ 'content_type.delete.success', ['%name%' => $contentType->getName()], - 'content_type' + 'ibexa_content_type' ); }); @@ -665,7 +666,7 @@ public function bulkDeleteAction(Request $request, ContentTypeGroup $group): Res /** @Desc("Content Type '%name%' deleted.") */ 'content_type.delete.success', ['%name%' => $contentType->getName()], - 'content_type' + 'ibexa_content_type' ); } }); @@ -804,7 +805,7 @@ private function getUserNameById(int $userId): ?string /** @Desc("another user") */ 'content_type.user_name.can_not_be_fetched', [], - 'content_type' + 'ibexa_content_type' ); } } diff --git a/src/bundle/Controller/ContentTypeGroupController.php b/src/bundle/Controller/ContentTypeGroupController.php index 4ea1395c25..1a9c40614c 100644 --- a/src/bundle/Controller/ContentTypeGroupController.php +++ b/src/bundle/Controller/ContentTypeGroupController.php @@ -20,6 +20,7 @@ use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -124,7 +125,7 @@ public function createAction(Request $request): Response /** @Desc("Created Content Type group '%name%'.") */ 'content_type_group.create.success', ['%name%' => $data->getIdentifier()], - 'content_type' + 'ibexa_content_type' ); return new RedirectResponse($this->generateUrl('ibexa.content_type_group.view', [ @@ -168,7 +169,7 @@ public function updateAction(Request $request, ContentTypeGroup $group): Respons /** @Desc("Updated Content Type group '%name%'.") */ 'content_type_group.update.success', ['%name%' => $group->identifier], - 'content_type' + 'ibexa_content_type' ); return new RedirectResponse($this->generateUrl('ibexa.content_type_group.view', [ @@ -210,7 +211,7 @@ public function deleteAction(Request $request, ContentTypeGroup $group): Respons /** @Desc("Deleted Content Type group '%name%'.") */ 'content_type_group.delete.success', ['%name%' => $group->identifier], - 'content_type' + 'ibexa_content_type' ); }); @@ -247,7 +248,7 @@ public function bulkDeleteAction(Request $request): Response /** @Desc("Deleted Content Type group '%name%'.") */ 'content_type_group.delete.success', ['%name%' => $group->identifier], - 'content_type' + 'ibexa_content_type' ); } }); diff --git a/src/bundle/Controller/LanguageController.php b/src/bundle/Controller/LanguageController.php index b3ea9324b8..fa04c96650 100644 --- a/src/bundle/Controller/LanguageController.php +++ b/src/bundle/Controller/LanguageController.php @@ -19,6 +19,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -137,7 +138,7 @@ public function deleteAction(Request $request, Language $language): Response /** @Desc("Language '%name%' removed.") */ 'language.delete.success', ['%name%' => $language->name], - 'language' + 'ibexa_language' ); }); @@ -180,7 +181,7 @@ public function bulkDeleteAction(Request $request): Response /** @Desc("Language '%name%' removed.") */ 'language.delete.success', ['%name%' => $language->name], - 'language' + 'ibexa_language' ); } }); @@ -207,7 +208,7 @@ public function createAction(Request $request): Response /** @Desc("Language '%name%' created.") */ 'language.create.success', ['%name%' => $language->name], - 'language' + 'ibexa_language' ); return new RedirectResponse($this->generateUrl('ibexa.language.view', [ @@ -245,7 +246,7 @@ public function editAction(Request $request, Language $language): Response /** @Desc("Language '%name%' updated.") */ 'language.update.success', ['%name%' => $language->name], - 'language' + 'ibexa_language' ); return new RedirectResponse($this->generateUrl('ibexa.language.view', [ diff --git a/src/bundle/Controller/LinkManagerController.php b/src/bundle/Controller/LinkManagerController.php index d449e931ba..3987242863 100644 --- a/src/bundle/Controller/LinkManagerController.php +++ b/src/bundle/Controller/LinkManagerController.php @@ -15,6 +15,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\URLService; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -80,7 +81,7 @@ public function editAction(Request $request, int $urlId): Response /** @Desc("URL updated") */ 'url.update.success', [], - 'linkmanager' + 'ibexa_linkmanager' ); return $this->redirectToRoute('ibexa.url_management'); diff --git a/src/bundle/Controller/LocationController.php b/src/bundle/Controller/LocationController.php index 260696670d..e75f3e2cbd 100644 --- a/src/bundle/Controller/LocationController.php +++ b/src/bundle/Controller/LocationController.php @@ -37,6 +37,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct; use Ibexa\Core\Base\Exceptions\InvalidArgumentException; use Ibexa\Core\Helper\TranslationHelper; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -156,7 +157,7 @@ public function moveAction(Request $request): Response /** @Desc("'%name%' moved to '%location%'") */ 'location.move.success', ['%name%' => $location->getContentInfo()->name, '%location%' => $newParentLocation->getContentInfo()->name], - 'location' + 'ibexa_location' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ @@ -215,7 +216,7 @@ public function copyAction(Request $request): Response /** @Desc("'%name%' copied to '%location%'") */ 'location.copy.success', ['%name%' => $location->getContentInfo()->name, '%location%' => $newParentLocation->getContentInfo()->name], - 'location' + 'ibexa_location' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ @@ -268,7 +269,7 @@ public function copySubtreeAction(Request $request): Response '%name%' => $location->getContentInfo()->name, '%location%' => $newParentLocation->getContentInfo()->name, ], - 'location' + 'ibexa_location' ); return $this->redirectToLocation($newLocation); @@ -315,7 +316,7 @@ public function swapAction(Request $request): Response /** @Desc("Location '%name%' swapped with Location '%location%'") */ 'location.swap.success', ['%name%' => $currentLocation->getContentInfo()->name, '%location%' => $newLocation->getContentInfo()->name], - 'location' + 'ibexa_location' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ @@ -412,7 +413,7 @@ private function handleTrashLocation(LocationTrashData $data): RedirectResponse /** @Desc("Location '%name%' moved to Trash.") */ 'location.trash.success', ['%name%' => $location->getContentInfo()->name], - 'location' + 'ibexa_location' ) ); @@ -438,7 +439,7 @@ private function handleTrashLocationForm($data): RedirectResponse /** @Desc("Location '%name%' moved to Trash.") */ 'location.trash.success', ['%name%' => $location->getContentInfo()->name], - 'location' + 'ibexa_location' ) ); @@ -477,7 +478,7 @@ public function removeAction(Request $request): Response /** @Desc("Location '%name%' removed.") */ 'location.delete.success', ['%name%' => $location->getContentInfo()->name], - 'location' + 'ibexa_location' ); } @@ -528,7 +529,7 @@ public function addAction(Request $request): Response /** @Desc("Location '%name%' created.") */ 'location.create.success', ['%name%' => $newLocation->getContentInfo()->name], - 'location' + 'ibexa_location' ); } @@ -579,7 +580,7 @@ public function updateVisibilityAction(Request $request): Response /** @Desc("Location '%name%' hidden.") */ 'location.update_success.success.hidden', ['%name%' => $contentName], - 'location' + 'ibexa_location' ); } else { $this->locationService->unhideLocation($location); @@ -587,7 +588,7 @@ public function updateVisibilityAction(Request $request): Response /** @Desc("Location '%name%' revealed.") */ 'location.update_success.success.unhidden', ['%name%' => $contentName], - 'location' + 'ibexa_location' ); } } catch (APIRepositoryUnauthorizedException $e) { @@ -630,7 +631,7 @@ public function updateAction(Request $request): Response /** @Desc("Location '%name%' updated.") */ 'location.update.success', ['%name%' => $location->getContentInfo()->name], - 'location' + 'ibexa_location' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ @@ -677,7 +678,7 @@ public function assignSectionAction(Request $request): Response /** @Desc("Subtree assigned to Section '%name%'") */ 'location.assign_section.success', ['%name%' => $section->name], - 'location' + 'ibexa_location' ); return $this->redirectToLocation($location, DetailsTab::URI_FRAGMENT); diff --git a/src/bundle/Controller/ObjectStateController.php b/src/bundle/Controller/ObjectStateController.php index 65992b9da7..ddb467ecac 100644 --- a/src/bundle/Controller/ObjectStateController.php +++ b/src/bundle/Controller/ObjectStateController.php @@ -28,6 +28,7 @@ use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -151,7 +152,7 @@ function (ObjectStateCreateData $data) use ($defaultLanguageCode, $objectStateGr /** @Desc("Object state '%name%' created.") */ 'object_state.create.success', ['%name%' => $data->getName()], - 'object_state' + 'ibexa_object_state' ); return $this->redirectToRoute('ibexa.object_state.state.view', [ @@ -194,7 +195,7 @@ public function deleteAction(Request $request, ObjectState $objectState): Respon /** @Desc("Object state '%name%' deleted.") */ 'object_state.delete.success', ['%name%' => $objectState->getName()], - 'object_state' + 'ibexa_object_state' ); }); @@ -235,7 +236,7 @@ public function bulkDeleteAction(Request $request, int $objectStateGroupId): Res /** @Desc("Object state '%name%' deleted.") */ 'object_state.delete.success', ['%name%' => $objectState->getName()], - 'object_state' + 'ibexa_object_state' ); } }); @@ -278,7 +279,7 @@ public function updateAction(Request $request, ObjectState $objectState): Respon /** @Desc("Object state '%name%' updated.") */ 'object_state.update.success', ['%name%' => $updatedObjectState->getName()], - 'object_state' + 'ibexa_object_state' ); return $this->redirectToRoute('ibexa.object_state.state.view', [ @@ -337,7 +338,7 @@ public function updateContentStateAction( /** @Desc("Content item's Object state changed to '%name%'.") */ 'content_object_state.update.success', ['%name%' => $objectState->getName()], - 'object_state' + 'ibexa_object_state' ); }); diff --git a/src/bundle/Controller/ObjectStateGroupController.php b/src/bundle/Controller/ObjectStateGroupController.php index cf749c3d08..9657fcfc3c 100644 --- a/src/bundle/Controller/ObjectStateGroupController.php +++ b/src/bundle/Controller/ObjectStateGroupController.php @@ -20,6 +20,7 @@ use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -128,7 +129,7 @@ function (ObjectStateGroupCreateData $data) use ($defaultLanguageCode) { /** @Desc("Object state group '%name%' created.") */ 'object_state_group.create.success', ['%name%' => $data->getName()], - 'object_state' + 'ibexa_object_state' ); return $this->redirectToRoute('ibexa.object_state.group.view', [ @@ -170,7 +171,7 @@ public function deleteAction(Request $request, ObjectStateGroup $group): Respons /** @Desc("Object state group '%name%' deleted.") */ 'object_state_group.delete.success', ['%name%' => $group->getName()], - 'object_state' + 'ibexa_object_state' ); }); @@ -207,7 +208,7 @@ public function bulkDeleteAction(Request $request): Response /** @Desc("Object state group '%name%' deleted.") */ 'object_state_group.delete.success', ['%name%' => $objectStateGroup->getName()], - 'object_state' + 'ibexa_object_state' ); } }); @@ -247,7 +248,7 @@ public function updateAction(Request $request, ObjectStateGroup $group): Respons /** @Desc("Object state group '%name%' updated.") */ 'object_state_group.update.success', ['%name%' => $updatedGroup->getName()], - 'object_state' + 'ibexa_object_state' ); return $this->redirectToRoute('ibexa.object_state.group.view', [ diff --git a/src/bundle/Controller/PolicyController.php b/src/bundle/Controller/PolicyController.php index 2b4e9f824a..33a2681089 100644 --- a/src/bundle/Controller/PolicyController.php +++ b/src/bundle/Controller/PolicyController.php @@ -24,6 +24,7 @@ use Ibexa\Contracts\Core\Repository\Values\User\Role; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -153,7 +154,7 @@ public function createAction(Request $request, Role $role): Response /** @Desc("Now you can set Limitations for the Policy.") */ 'policy.add.set_limitation', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.policy.create_with_limitation', [ @@ -176,7 +177,7 @@ public function createAction(Request $request, Role $role): Response /** @Desc("Created new Policies in Role '%role%'.") */ 'policy.add.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -220,7 +221,7 @@ public function updateAction(Request $request, Role $role, Policy $policy): Resp /** @Desc("Policy type '%policy%' does not contain Limitations.") */ 'policy.edit.no_limitations', ['%policy%' => $policy->module . '/' . $policy->function], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -251,7 +252,7 @@ public function updateAction(Request $request, Role $role, Policy $policy): Resp /** @Desc("Updated Policies in Role '%role%'.") */ 'policy.update.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -301,7 +302,7 @@ public function createWithLimitationAction(Request $request, Role $role, string /** @Desc("Created new Policies in Role '%role%'.") */ 'policy.add.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -353,7 +354,7 @@ public function deleteAction(Request $request, Role $role, Policy $policy): Resp /** @Desc("Removed Policies from Role '%role%'.") */ 'policy.delete.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -409,7 +410,7 @@ public function bulkDeleteAction(Request $request, Role $role): Response /** @Desc("Removed Policies from Role '%role%'.") */ 'policy.delete.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ diff --git a/src/bundle/Controller/RoleAssignmentController.php b/src/bundle/Controller/RoleAssignmentController.php index ea89620bc5..1efaced559 100644 --- a/src/bundle/Controller/RoleAssignmentController.php +++ b/src/bundle/Controller/RoleAssignmentController.php @@ -24,6 +24,7 @@ use Ibexa\Contracts\Core\Repository\Values\User\RoleAssignment; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -122,7 +123,7 @@ public function createAction(Request $request, Role $role): Response /** @Desc("Assigned Users/Groups to Role '%role%'.") */ 'role.assignment_create.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -165,7 +166,7 @@ public function deleteAction(Request $request, Role $role, RoleAssignment $roleA /** @Desc("Unassigned Users/Groups from Role '%role%'.") */ 'role.assignment_delete.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -210,7 +211,7 @@ public function bulkDeleteAction(Request $request, Role $role): Response /** @Desc("Unassigned Users/Groups from Role '%role%'.") */ 'role.assignment_delete.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ diff --git a/src/bundle/Controller/RoleController.php b/src/bundle/Controller/RoleController.php index 839becd900..a6313ee056 100644 --- a/src/bundle/Controller/RoleController.php +++ b/src/bundle/Controller/RoleController.php @@ -25,6 +25,7 @@ use Ibexa\Contracts\Core\Repository\Values\User\Role; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -145,7 +146,7 @@ public function createAction(Request $request): Response /** @Desc("Role '%role%' created.") */ 'role.create.success', ['%role%' => $roleDraft->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -179,7 +180,7 @@ public function copyAction(Request $request, Role $role): Response /** @Desc("Role '%role%' copied.") */ 'role.copy.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -226,7 +227,7 @@ public function updateAction(Request $request, Role $role): Response /** @Desc("Role '%role%' updated.") */ 'role.update.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.view', [ @@ -268,7 +269,7 @@ public function deleteAction(Request $request, Role $role): Response /** @Desc("Role '%role%' removed.") */ 'role.delete.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); return new RedirectResponse($this->generateUrl('ibexa.role.list')); @@ -313,7 +314,7 @@ public function bulkDeleteAction(Request $request): Response /** @Desc("Role '%role%' removed.") */ 'role.delete.success', ['%role%' => $role->identifier], - 'role' + 'ibexa_role' ); } diff --git a/src/bundle/Controller/SectionController.php b/src/bundle/Controller/SectionController.php index 535420d2d9..e699a8d184 100644 --- a/src/bundle/Controller/SectionController.php +++ b/src/bundle/Controller/SectionController.php @@ -35,6 +35,7 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Ibexa\Core\Pagination\Pagerfanta\ContentSearchAdapter; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -282,7 +283,7 @@ public function deleteAction(Request $request, Section $section): Response /** @Desc("Section '%name%' removed.") */ 'section.delete.success', ['%name%' => $section->name], - 'section' + 'ibexa_section' ); return new RedirectResponse($this->generateUrl('ibexa.section.list')); @@ -321,7 +322,7 @@ public function bulkDeleteAction(Request $request): Response /** @Desc("Section '%name%' removed.") */ 'section.delete.success', ['%name%' => $section->name], - 'section' + 'ibexa_section' ); } }); @@ -369,7 +370,7 @@ public function assignContentAction(Request $request, Section $section): Respons /** @Desc("%contentItemsCount% Content items assigned to '%name%'") */ 'section.assign_content.success', ['%name%' => $section->name, '%contentItemsCount%' => \count($contentInfos)], - 'section' + 'ibexa_section' ); return new RedirectResponse($this->generateUrl('ibexa.section.view', [ @@ -410,7 +411,7 @@ public function createAction(Request $request): Response /** @Desc("Section '%name%' created.") */ 'section.create.success', ['%name%' => $section->name], - 'section' + 'ibexa_section' ); return new RedirectResponse($this->generateUrl('ibexa.section.view', [ @@ -452,7 +453,7 @@ public function updateAction(Request $request, Section $section): Response /** @Desc("Section '%name%' updated.") */ 'section.update.success', ['%name%' => $section->name], - 'section' + 'ibexa_section' ); return new RedirectResponse($this->generateUrl('ibexa.section.view', [ diff --git a/src/bundle/Controller/TranslationController.php b/src/bundle/Controller/TranslationController.php index c21a24aa1f..36bdde5f15 100644 --- a/src/bundle/Controller/TranslationController.php +++ b/src/bundle/Controller/TranslationController.php @@ -15,6 +15,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Core\Helper\TranslationHelper; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -128,7 +129,7 @@ public function removeAction(Request $request): Response '%languageCode%' => $languageCode, '%name%' => $this->translationHelper->getTranslatedContentNameByContentInfo($contentInfo), ], - 'translation' + 'ibexa_admin_ui' ); } diff --git a/src/bundle/Controller/TrashController.php b/src/bundle/Controller/TrashController.php index b64ed29a66..d5c83f52bd 100644 --- a/src/bundle/Controller/TrashController.php +++ b/src/bundle/Controller/TrashController.php @@ -30,6 +30,7 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\Form\Util\StringUtil; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -202,7 +203,7 @@ public function emptyAction(Request $request): Response /** @Desc("Trash emptied.") */ 'trash.empty.success', [], - 'trash' + 'ibexa_trash' ); return new RedirectResponse($this->generateUrl('ibexa.trash.list')); @@ -249,14 +250,14 @@ function (TrashItemRestoreData $data) use ($request) { /** @Desc("Restored content to its original Location.") */ 'trash.restore_original_location.success', [], - 'trash' + 'ibexa_trash' ); } else { $this->notificationHandler->success( /** @Desc("Restored content under Location '%location%'.") */ 'trash.restore_new_location.success', ['%location%' => $newParentLocation->getContentInfo()->name], - 'trash' + 'ibexa_trash' ); } @@ -303,7 +304,7 @@ function (TrashItemDeleteData $data) use ($request) { /** @Desc("Deleted selected item(s) from Trash.") */ 'trash.deleted.success', [], - 'trash' + 'ibexa_trash' ); return $this->redirectToTrashList($request); diff --git a/src/bundle/Controller/URLWildcardController.php b/src/bundle/Controller/URLWildcardController.php index 9b21a1b6a9..810d4c6541 100644 --- a/src/bundle/Controller/URLWildcardController.php +++ b/src/bundle/Controller/URLWildcardController.php @@ -19,6 +19,7 @@ use Ibexa\Contracts\Core\Repository\URLWildcardService; use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard; use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcardUpdateStruct; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -71,7 +72,7 @@ public function addAction(Request $request): Response /** @Desc("URL Wildcard created.") */ 'url_wildcard.create.success', [], - 'url_wildcard' + 'ibexa_url_wildcard' ); }); } @@ -113,7 +114,7 @@ function (URLWildcardUpdateData $data) use ($urlWildcard) { /** @Desc("URL Wildcard updated.") */ 'url_wildcard.update.success', [], - 'url_wildcard' + 'ibexa_url_wildcard' ); return $this->redirect($this->generateUrl('ibexa.url_management', [ @@ -161,7 +162,7 @@ public function bulkDeleteAction(Request $request): Response /** @Desc("URL Wildcard(s) deleted.") */ 'url_wildcard.delete.success', [], - 'url_wildcard' + 'ibexa_url_wildcard' ); } diff --git a/src/bundle/Controller/User/InvitationController.php b/src/bundle/Controller/User/InvitationController.php index c74f798466..e73eefc4d2 100644 --- a/src/bundle/Controller/User/InvitationController.php +++ b/src/bundle/Controller/User/InvitationController.php @@ -17,6 +17,7 @@ use Ibexa\Contracts\User\Invitation\InvitationSender; use Ibexa\Contracts\User\Invitation\InvitationService; use Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -94,7 +95,7 @@ public function sendInvitationsAction(int $userGroupId, Request $request): Respo [ '%email%' => $struct->getEmail(), ], - 'user_invitation' + 'ibexa_user_invitation' ); } catch (UserAlreadyExistsException $exception) { $this->notificationHandler->info( @@ -103,7 +104,7 @@ public function sendInvitationsAction(int $userGroupId, Request $request): Respo [ '%email%' => $struct->getEmail(), ], - 'user_invitation' + 'ibexa_user_invitation' ); } } @@ -113,7 +114,7 @@ public function sendInvitationsAction(int $userGroupId, Request $request): Respo /** @Desc("Invitations sent") */ 'ibexa.user.invitations.success', [], - 'user_invitation' + 'ibexa_user_invitation' ); } } diff --git a/src/bundle/Controller/User/UserDeleteController.php b/src/bundle/Controller/User/UserDeleteController.php index 5e9698d2a1..71d20dae81 100644 --- a/src/bundle/Controller/User/UserDeleteController.php +++ b/src/bundle/Controller/User/UserDeleteController.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\UserService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -86,7 +87,7 @@ public function userDeleteAction(Request $request): Response /** @Desc("User with login '%login%' deleted.") */ 'user.delete.success', ['%login%' => $user->login], - 'content' + 'ibexa_content' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ diff --git a/src/bundle/Controller/VersionController.php b/src/bundle/Controller/VersionController.php index a3e986dd05..991665b2c6 100644 --- a/src/bundle/Controller/VersionController.php +++ b/src/bundle/Controller/VersionController.php @@ -14,6 +14,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Core\Helper\TranslationHelper; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -101,7 +102,7 @@ public function removeAction(Request $request): Response [ '%name%' => $this->translationHelper->getTranslatedContentNameByContentInfo($contentInfo), ], - 'version' + 'ibexa_admin_ui' ); return new RedirectResponse($this->generateUrl('ibexa.content.view', [ diff --git a/src/bundle/Resources/config/bazinga_js_translation.yaml b/src/bundle/Resources/config/bazinga_js_translation.yaml index 537fadaadf..cb0460b3ea 100644 --- a/src/bundle/Resources/config/bazinga_js_translation.yaml +++ b/src/bundle/Resources/config/bazinga_js_translation.yaml @@ -1,14 +1,14 @@ active_domains: - - 'universal_discovery_widget' + - 'ibexa_universal_discovery_widget' - 'alloy_editor' - - 'fieldtypes_edit' - - 'notifications' - - 'search' - - 'content' - - 'multi_file_upload' - - 'sub_items' - - 'content_tree' - - 'trash_ui' - - 'user_invitation' - - 'content_type' + - 'ibexa_fieldtypes_edit' + - 'ibexa_notifications' + - 'ibexa_search' + - 'ibexa_content' + - 'ibexa_multi_file_upload' + - 'ibexa_sub_items' + - 'ibexa_content_tree' + - 'ibexa_trash_ui' + - 'ibexa_user_invitation' + - 'ibexa_content_type' - 'messages' diff --git a/src/bundle/Resources/public/js/scripts/admin.content.edit.js b/src/bundle/Resources/public/js/scripts/admin.content.edit.js index 620c59b6d0..6627502684 100644 --- a/src/bundle/Resources/public/js/scripts/admin.content.edit.js +++ b/src/bundle/Resources/public/js/scripts/admin.content.edit.js @@ -161,7 +161,7 @@ const saveMessage = Translator.trans( /*@Desc("Draft saved %time%")*/ 'content_edit.autosave.status_saved.message.full', { time: saveTime }, - 'content', + 'ibexa_content', ); autosaveStatusSavedNode.innerHTML = saveMessage; diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js index 57d73d5fcb..109bcdab2c 100644 --- a/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js +++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js @@ -19,7 +19,7 @@ const noFieldsAddedError = Translator.trans( /*@Desc("You have to add at least one field definition")*/ 'content_type.edit.error.no_added_fields_definition', {}, - 'content_type', + 'ibexa_content_type', ); const endpoints = { add: { diff --git a/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js b/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js index 8912cf8312..d4495cc5fa 100644 --- a/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js +++ b/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js @@ -28,7 +28,7 @@ const errorMessage = Translator.trans( /*@Desc("Could not fetch content names")*/ 'limitation.pick.error', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); fetch(request) @@ -171,7 +171,7 @@ .filter((idString) => !!idString) .map((idString) => parseInt(idString, 10)); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Choose Locations")*/ 'subtree_limitation.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Choose Locations")*/ 'subtree_limitation.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/admin.location.view.js b/src/bundle/Resources/public/js/scripts/admin.location.view.js index bfa500217e..498b63e4e5 100644 --- a/src/bundle/Resources/public/js/scripts/admin.location.view.js +++ b/src/bundle/Resources/public/js/scripts/admin.location.view.js @@ -51,7 +51,7 @@ const errorMessage = Translator.trans( /*@Desc("You don't have permission to edit this Content item")*/ 'content.edit.permission.error', {}, - 'content', + 'ibexa_content', ); const handleCanEditCheck = (response) => { if (response.canEdit) { diff --git a/src/bundle/Resources/public/js/scripts/admin.notifications.modal.js b/src/bundle/Resources/public/js/scripts/admin.notifications.modal.js index edf17b0bf6..3ced693d1e 100644 --- a/src/bundle/Resources/public/js/scripts/admin.notifications.modal.js +++ b/src/bundle/Resources/public/js/scripts/admin.notifications.modal.js @@ -82,7 +82,7 @@ const message = Translator.trans( /* @Desc("Cannot update notifications") */ 'notifications.modal.message.error', { error: error.message }, - 'notifications', + 'ibexa_notifications', ); showWarningNotification(message, (notificationNode) => { diff --git a/src/bundle/Resources/public/js/scripts/admin.trash.js b/src/bundle/Resources/public/js/scripts/admin.trash.js index 6f9886272b..c93c61e173 100644 --- a/src/bundle/Resources/public/js/scripts/admin.trash.js +++ b/src/bundle/Resources/public/js/scripts/admin.trash.js @@ -25,7 +25,7 @@ content: contentName, children_count: numberOfSubitems, }, - 'content', + 'ibexa_content', ); modalBody.querySelector('.ibexa-modal__option-description').innerHTML = message; @@ -33,7 +33,7 @@ const message = Translator.trans( /*@Desc("Are you sure you want to send this Content item to Trash?")*/ 'trash.modal.message', {}, - 'content', + 'ibexa_content', ); modalBody.innerHTML = message; diff --git a/src/bundle/Resources/public/js/scripts/admin.trash.list.js b/src/bundle/Resources/public/js/scripts/admin.trash.list.js index 1c742e5c1b..1168e4ab2b 100644 --- a/src/bundle/Resources/public/js/scripts/admin.trash.list.js +++ b/src/bundle/Resources/public/js/scripts/admin.trash.list.js @@ -20,7 +20,7 @@ const btns = doc.querySelectorAll('.ibexa-btn--open-udw'); const udwContainer = doc.getElementById('react-udw'); const autoSendNodes = doc.querySelectorAll('.ibexa-trash-search-form__item--auto-send'); - const errorMessage = Translator.trans(/*@Desc("Cannot fetch user list")*/ 'trash.user_list.error', {}, 'trash_ui'); + const errorMessage = Translator.trans(/*@Desc("Cannot fetch user list")*/ 'trash.user_list.error', {}, 'ibexa_trash_ui'); const dateConfig = { mode: 'range', locale: { @@ -47,7 +47,7 @@ const title = Translator.trans( /*@Desc("Select a new location to restore the content items")*/ 'restore_under_new_location.title', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); udwRoot = ReactDOM.createRoot(udwContainer); diff --git a/src/bundle/Resources/public/js/scripts/admin.version.edit.conflict.js b/src/bundle/Resources/public/js/scripts/admin.version.edit.conflict.js index e5bf2a7452..aa1ae0cd78 100644 --- a/src/bundle/Resources/public/js/scripts/admin.version.edit.conflict.js +++ b/src/bundle/Resources/public/js/scripts/admin.version.edit.conflict.js @@ -6,7 +6,7 @@ const errorMessage = Translator.trans( /*@Desc("You don't have permission to edit this Content item")*/ 'content.edit.permission.error', {}, - 'content', + 'ibexa_content', ); const handleCanEditCheck = (response) => { if (response.canEdit) { diff --git a/src/bundle/Resources/public/js/scripts/button.content.edit.js b/src/bundle/Resources/public/js/scripts/button.content.edit.js index 00ca739f2c..8fa5cb7320 100644 --- a/src/bundle/Resources/public/js/scripts/button.content.edit.js +++ b/src/bundle/Resources/public/js/scripts/button.content.edit.js @@ -16,7 +16,7 @@ const errorMessage = Translator.trans( /*@Desc("You don't have permission to edit this Content item")*/ 'content.edit.permission.error', {}, - 'content', + 'ibexa_content', ); const submitVersionEditForm = () => { contentInfoInput.value = contentId; diff --git a/src/bundle/Resources/public/js/scripts/cotf/create.js b/src/bundle/Resources/public/js/scripts/cotf/create.js index 064576f0a9..314fe34e1d 100644 --- a/src/bundle/Resources/public/js/scripts/cotf/create.js +++ b/src/bundle/Resources/public/js/scripts/cotf/create.js @@ -16,7 +16,7 @@ event.preventDefault(); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Create content")*/ 'dashboard.create.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Create content")*/ 'dashboard.create.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js index 3a6eb86664..9ca8b6f764 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js @@ -305,7 +305,7 @@ const errorMessage = Translator.trans( /* @Desc("Area below needs correction") */ 'ezmaplocation.create.message.error', {}, - 'fieldtypes_edit', + 'ibexa_fieldtypes_edit', ); const allFieldsResult = { isError: true, errorMessage: errorMessage }; diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezimage.js b/src/bundle/Resources/public/js/scripts/fieldType/ezimage.js index e5d498fe4c..a7dc2b86e9 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezimage.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezimage.js @@ -47,12 +47,12 @@ widthNode.innerHTML = Translator.trans( /* @Desc("W:%width% px") */ 'ezimage.dimensions.width', { width }, - 'fieldtypes_edit', + 'ibexa_fieldtypes_edit', ); heightNode.innerHTML = Translator.trans( /* @Desc("H:%height% px") */ 'ezimage.dimensions.height', { height }, - 'fieldtypes_edit', + 'ibexa_fieldtypes_edit', ); }; diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js b/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js index e965faff42..71b89a89c9 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js @@ -64,7 +64,7 @@ Translator.trans( /* @Desc("The image has been published and can now be reused") */ 'ezimageasset.create.message.success', {}, - 'fieldtypes_edit', + 'ibexa_fieldtypes_edit', ), ); } @@ -78,7 +78,7 @@ const message = Translator.trans( /* @Desc("Error while creating Image Asset: %error%") */ 'ezimageasset.create.message.error', { error: error.message }, - 'fieldtypes_edit', + 'ibexa_fieldtypes_edit', ); this.toggleLoading(false); @@ -161,7 +161,7 @@ const udwContainer = doc.getElementById('react-udw'); const udwRoot = ReactDOM.createRoot(udwContainer); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Select Image Asset")*/ 'ezimageasset.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Select Image Asset")*/ 'ezimageasset.title', {}, 'ibexa_universal_discovery_widget'); const closeUDW = () => udwRoot.unmount(); const onCancel = closeUDW; const onConfirm = (items) => { diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js b/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js index 3b51b6ce15..f0fe807ac1 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js @@ -112,12 +112,12 @@ ? Translator.trans( /*@Desc("Select a Content item")*/ 'ezobjectrelationlist.title.single', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ) : Translator.trans( /*@Desc("Select Content item(s)")*/ 'ezobjectrelationlist.title.multi', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); udwRoot = ReactDOM.createRoot(udwContainer); diff --git a/src/bundle/Resources/public/js/scripts/helpers/location.helper.js b/src/bundle/Resources/public/js/scripts/helpers/location.helper.js index d3bdcacbbd..b27e565dda 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/location.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/location.helper.js @@ -38,7 +38,7 @@ const errorMessage = Translator.trans( /*@Desc("Cannot find children Locations with ID %idList%")*/ 'select_location.error', { idList: idList.join(',') }, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); fetch(request) diff --git a/src/bundle/Resources/public/js/scripts/udw/browse.js b/src/bundle/Resources/public/js/scripts/udw/browse.js index d413ba703c..055fdc3db4 100644 --- a/src/bundle/Resources/public/js/scripts/udw/browse.js +++ b/src/bundle/Resources/public/js/scripts/udw/browse.js @@ -16,7 +16,7 @@ event.preventDefault(); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Browse content")*/ 'browse.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Browse content")*/ 'browse.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/udw/copy.js b/src/bundle/Resources/public/js/scripts/udw/copy.js index 79e138e589..a574f00a6a 100644 --- a/src/bundle/Resources/public/js/scripts/udw/copy.js +++ b/src/bundle/Resources/public/js/scripts/udw/copy.js @@ -16,7 +16,7 @@ event.preventDefault(); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Select Location")*/ 'copy.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Select Location")*/ 'copy.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/udw/copy_subtree.js b/src/bundle/Resources/public/js/scripts/udw/copy_subtree.js index 1cba73486c..ce4b2f29f8 100644 --- a/src/bundle/Resources/public/js/scripts/udw/copy_subtree.js +++ b/src/bundle/Resources/public/js/scripts/udw/copy_subtree.js @@ -15,7 +15,7 @@ const openUDW = (event) => { event.preventDefault(); - const title = Translator.trans(/*@Desc("Select Location")*/ 'subtree.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Select Location")*/ 'subtree.title', {}, 'ibexa_universal_discovery_widget'); const config = JSON.parse(event.currentTarget.dataset.udwConfig); udwRoot = ReactDOM.createRoot(udwContainer); diff --git a/src/bundle/Resources/public/js/scripts/udw/locations.tab.js b/src/bundle/Resources/public/js/scripts/udw/locations.tab.js index 9e8d38bb2e..e0a83c6ded 100644 --- a/src/bundle/Resources/public/js/scripts/udw/locations.tab.js +++ b/src/bundle/Resources/public/js/scripts/udw/locations.tab.js @@ -23,7 +23,7 @@ event.stopPropagation(); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Select Location")*/ 'add_location.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Select Location")*/ 'add_location.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/udw/move.js b/src/bundle/Resources/public/js/scripts/udw/move.js index fcb8701ac2..ec98087393 100644 --- a/src/bundle/Resources/public/js/scripts/udw/move.js +++ b/src/bundle/Resources/public/js/scripts/udw/move.js @@ -21,7 +21,7 @@ event.preventDefault(); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Select destination")*/ 'move.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Select destination")*/ 'move.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/udw/select.location.js b/src/bundle/Resources/public/js/scripts/udw/select.location.js index 810bd854ac..6c95eaa5cb 100644 --- a/src/bundle/Resources/public/js/scripts/udw/select.location.js +++ b/src/bundle/Resources/public/js/scripts/udw/select.location.js @@ -34,7 +34,7 @@ const errorMessage = Translator.trans( /*@Desc("Cannot find children Locations with ID %idList%")*/ 'select_location.error', { idList: idList.join(',') }, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); fetch(request) diff --git a/src/bundle/Resources/public/js/scripts/udw/swap.js b/src/bundle/Resources/public/js/scripts/udw/swap.js index 7870294c00..2896efa1e9 100644 --- a/src/bundle/Resources/public/js/scripts/udw/swap.js +++ b/src/bundle/Resources/public/js/scripts/udw/swap.js @@ -21,7 +21,7 @@ event.preventDefault(); const config = JSON.parse(event.currentTarget.dataset.udwConfig); - const title = Translator.trans(/*@Desc("Select Location to swap with")*/ 'swap.title', {}, 'universal_discovery_widget'); + const title = Translator.trans(/*@Desc("Select Location to swap with")*/ 'swap.title', {}, 'ibexa_universal_discovery_widget'); udwRoot = ReactDOM.createRoot(udwContainer); udwRoot.render( diff --git a/src/bundle/Resources/public/js/scripts/user.invitation.modal.js b/src/bundle/Resources/public/js/scripts/user.invitation.modal.js index 6b5297cb1e..189b9eff8a 100644 --- a/src/bundle/Resources/public/js/scripts/user.invitation.modal.js +++ b/src/bundle/Resources/public/js/scripts/user.invitation.modal.js @@ -160,7 +160,7 @@ export class UserInvitationModal { const emptyEmailsMessage = Translator.trans( /*@Desc("Empty emails (%count%)")*/ 'modal.entry_issues.alert.empty_emails', { count: emptyEmailsCount }, - 'user_invitation', + 'ibexa_user_invitation', ); messages.push(emptyEmailsMessage); @@ -170,7 +170,7 @@ export class UserInvitationModal { const invalidEmailsMessage = Translator.trans( /*@Desc("Invalid emails (%count%)")*/ 'modal.entry_issues.alert.invalid_emails', { count: invalidEmailsCount }, - 'user_invitation', + 'ibexa_user_invitation', ); messages.push(invalidEmailsMessage); @@ -180,7 +180,7 @@ export class UserInvitationModal { const duplicatedEmailsMessage = Translator.trans( /*@Desc("Duplicated emails (%count%)")*/ 'modal.entry_issues.alert.duplicate_emails', { count: duplicateEntryCount }, - 'user_invitation', + 'ibexa_user_invitation', ); messages.push(duplicatedEmailsMessage); @@ -352,7 +352,7 @@ export class UserInvitationModal { const message = Translator.trans( /*@Desc("File %fileName% was uploaded")*/ 'modal.file_uploaded.message', { fileName }, - 'user_invitation', + 'ibexa_user_invitation', ); ibexa.helpers.notification.showInfoNotification(message); @@ -438,7 +438,7 @@ export class UserInvitationModal { titleNode.innerText = Translator.trans( /*@Desc("Invite members (%invitations_count%)")*/ 'modal.title', { invitations_count: invitationsCount }, - 'user_invitation', + 'ibexa_user_invitation', ); } diff --git a/src/bundle/Resources/public/scss/_edit-header.scss b/src/bundle/Resources/public/scss/_edit-header.scss index 71ad2675a6..4f64cb2fad 100644 --- a/src/bundle/Resources/public/scss/_edit-header.scss +++ b/src/bundle/Resources/public/scss/_edit-header.scss @@ -8,7 +8,7 @@ border-top-left-radius: $ibexa-border-radius; border-top-right-radius: $ibexa-border-radius; transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, border-bottom-width 0; - z-index: 1050; + z-index: 2; &__container { display: flex; diff --git a/src/bundle/Resources/public/scss/_main-container.scss b/src/bundle/Resources/public/scss/_main-container.scss index 4058e9d2b9..fe5d35671e 100644 --- a/src/bundle/Resources/public/scss/_main-container.scss +++ b/src/bundle/Resources/public/scss/_main-container.scss @@ -27,7 +27,7 @@ position: absolute; width: 100%; background-color: $ibexa-color-dark; - z-index: 1050; + z-index: 2; } &::before { diff --git a/src/bundle/Resources/translations/assets.en.xliff b/src/bundle/Resources/translations/assets.en.xliff deleted file mode 100644 index 342d6ec9a5..0000000000 --- a/src/bundle/Resources/translations/assets.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. -
- - - Missing or invalid CSRF token - Missing or invalid CSRF token - key: asset.upload.invalid_csrf - - -
-
diff --git a/src/bundle/Resources/translations/content_edit_component_preview_unavailable.en.xliff b/src/bundle/Resources/translations/content_edit_component_preview_unavailable.en.xliff deleted file mode 100644 index b964da6809..0000000000 --- a/src/bundle/Resources/translations/content_edit_component_preview_unavailable.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. -
- - - You cannot preview this translation because there is no site available for this language. Contact your Administrator. - You cannot preview this translation because there is no site available for this language. Contact your Administrator. - key: preview_unavailable - - -
-
diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_role.en.xliff b/src/bundle/Resources/translations/ezplatform_content_forms_role.en.xliff deleted file mode 100644 index cc2dd1122a..0000000000 --- a/src/bundle/Resources/translations/ezplatform_content_forms_role.en.xliff +++ /dev/null @@ -1,81 +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. -
- - - Self - Self - key: policy.limitation.group.self - - - Self - Self - key: policy.limitation.member_of.self_user_group - - - Self - Self - key: policy.limitation.owner.self - - - Create - Create - key: policy_create.save - - - Update - Update - key: policy_create.update - - - Delete - Delete - key: policy_delete.delete - - - Select Locations - Select Locations - key: role.policy.limitation.location.udw_button - - - Select Location(s) to use as Limitation - Select Location(s) to use as Limitation - key: role.policy.limitation.location.udw_title - - - Location deleted - Location deleted - key: role.policy.limitation.location_deleted - - - Editing Limitations for '%limitationTypeIdentifier%' is not available. - Editing Limitations for '%limitationTypeIdentifier%' is not available. - key: role.policy.limitation.not_implemented - - - Roles: - Roles: - key: role.policy.limitation.userpermissions.role_title - - - User Groups: - User Groups: - key: role.policy.limitation.userpermissions.user_groups_title - - - Type - Type - key: role.policy.type - - - Choose a type - Choose a type - key: role.policy.type.choose - - -
-
diff --git a/src/bundle/Resources/translations/adaptive_filters.en.xliff b/src/bundle/Resources/translations/ibexa_adaptive_filters.en.xliff similarity index 100% rename from src/bundle/Resources/translations/adaptive_filters.en.xliff rename to src/bundle/Resources/translations/ibexa_adaptive_filters.en.xliff diff --git a/src/bundle/Resources/translations/edit_translation_button.en.xliff b/src/bundle/Resources/translations/ibexa_admin_ui.en.xliff similarity index 55% rename from src/bundle/Resources/translations/edit_translation_button.en.xliff rename to src/bundle/Resources/translations/ibexa_admin_ui.en.xliff index e13eab7bf1..0f3169a2c8 100644 --- a/src/bundle/Resources/translations/edit_translation_button.en.xliff +++ b/src/bundle/Resources/translations/ibexa_admin_ui.en.xliff @@ -6,6 +6,11 @@ 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. + + Missing or invalid CSRF token + Missing or invalid CSRF token + key: asset.upload.invalid_csrf + Edit Edit @@ -16,6 +21,16 @@ Select language key: edit_translation.list.title + + Removed '%languageCode%' translation from '%name%'. + Removed '%languageCode%' translation from '%name%'. + key: translation.remove.success + + + Removed version(s) from '%name%'. + Removed version(s) from '%name%'. + key: version.delete.success + diff --git a/src/bundle/Resources/translations/bookmark.en.xliff b/src/bundle/Resources/translations/ibexa_bookmark.en.xliff similarity index 100% rename from src/bundle/Resources/translations/bookmark.en.xliff rename to src/bundle/Resources/translations/ibexa_bookmark.en.xliff diff --git a/src/bundle/Resources/translations/content.en.xliff b/src/bundle/Resources/translations/ibexa_content.en.xliff similarity index 100% rename from src/bundle/Resources/translations/content.en.xliff rename to src/bundle/Resources/translations/ibexa_content.en.xliff diff --git a/src/bundle/Resources/translations/content_create.en.xliff b/src/bundle/Resources/translations/ibexa_content_create.en.xliff similarity index 100% rename from src/bundle/Resources/translations/content_create.en.xliff rename to src/bundle/Resources/translations/ibexa_content_create.en.xliff 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/ezplatform_content_forms_policies.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff similarity index 95% rename from src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff rename to src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff index 824a8d8ca4..eba7ac38df 100644 --- a/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff @@ -26,6 +26,11 @@ Language key: policy.limitation.identifier.language + + MemberOf + MemberOf + key: policy.limitation.identifier.memberof + New Section New Section diff --git a/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff index 6e25c69cca..88b2620498 100644 --- a/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_forms_role.en.xliff @@ -11,6 +11,76 @@ Forbid key: policy.limitation.change_owner.forbid + + Self + Self + key: policy.limitation.group.self + + + Self + Self + key: policy.limitation.member_of.self_user_group + + + Self + Self + key: policy.limitation.owner.self + + + Create + Create + key: policy_create.save + + + Update + Update + key: policy_create.update + + + Delete + Delete + key: policy_delete.delete + + + Select Locations + Select Locations + key: role.policy.limitation.location.udw_button + + + Select Location(s) to use as Limitation + Select Location(s) to use as Limitation + key: role.policy.limitation.location.udw_title + + + Location deleted + Location deleted + key: role.policy.limitation.location_deleted + + + Editing Limitations for '%limitationTypeIdentifier%' is not available. + Editing Limitations for '%limitationTypeIdentifier%' is not available. + key: role.policy.limitation.not_implemented + + + Roles: + Roles: + key: role.policy.limitation.userpermissions.role_title + + + User Groups: + User Groups: + key: role.policy.limitation.userpermissions.user_groups_title + + + Type + Type + key: role.policy.type + + + Choose a type + Choose a type + key: role.policy.type.choose + diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_url.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_url.en.xliff similarity index 100% rename from src/bundle/Resources/translations/ezplatform_content_forms_url.en.xliff rename to src/bundle/Resources/translations/ibexa_content_forms_url.en.xliff diff --git a/src/bundle/Resources/translations/content_preview.en.xliff b/src/bundle/Resources/translations/ibexa_content_preview.en.xliff similarity index 70% rename from src/bundle/Resources/translations/content_preview.en.xliff rename to src/bundle/Resources/translations/ibexa_content_preview.en.xliff index b71fae8852..7186715ac1 100644 --- a/src/bundle/Resources/translations/content_preview.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content_preview.en.xliff @@ -16,6 +16,11 @@ Preview key: preview + + You cannot preview this translation because there is no site available for this language. Contact your Administrator. + You cannot preview this translation because there is no site available for this language. Contact your Administrator. + key: preview_unavailable + diff --git a/src/bundle/Resources/translations/content_tree.en.xliff b/src/bundle/Resources/translations/ibexa_content_tree.en.xliff similarity index 100% rename from src/bundle/Resources/translations/content_tree.en.xliff rename to src/bundle/Resources/translations/ibexa_content_tree.en.xliff diff --git a/src/bundle/Resources/translations/content_type.en.xliff b/src/bundle/Resources/translations/ibexa_content_type.en.xliff similarity index 100% rename from src/bundle/Resources/translations/content_type.en.xliff rename to src/bundle/Resources/translations/ibexa_content_type.en.xliff diff --git a/src/bundle/Resources/translations/content_url.en.xliff b/src/bundle/Resources/translations/ibexa_content_url.en.xliff similarity index 100% rename from src/bundle/Resources/translations/content_url.en.xliff rename to src/bundle/Resources/translations/ibexa_content_url.en.xliff diff --git a/src/bundle/Resources/translations/dashboard.en.xliff b/src/bundle/Resources/translations/ibexa_dashboard.en.xliff similarity index 100% rename from src/bundle/Resources/translations/dashboard.en.xliff rename to src/bundle/Resources/translations/ibexa_dashboard.en.xliff diff --git a/src/bundle/Resources/translations/date_period.en.xliff b/src/bundle/Resources/translations/ibexa_date_period.en.xliff similarity index 100% rename from src/bundle/Resources/translations/date_period.en.xliff rename to src/bundle/Resources/translations/ibexa_date_period.en.xliff diff --git a/src/bundle/Resources/translations/draft_conflict.en.xliff b/src/bundle/Resources/translations/ibexa_draft_conflict.en.xliff similarity index 100% rename from src/bundle/Resources/translations/draft_conflict.en.xliff rename to src/bundle/Resources/translations/ibexa_draft_conflict.en.xliff diff --git a/src/bundle/Resources/translations/drafts.en.xliff b/src/bundle/Resources/translations/ibexa_drafts.en.xliff similarity index 100% rename from src/bundle/Resources/translations/drafts.en.xliff rename to src/bundle/Resources/translations/ibexa_drafts.en.xliff diff --git a/src/bundle/Resources/translations/dropdown.en.xliff b/src/bundle/Resources/translations/ibexa_dropdown.en.xliff similarity index 100% rename from src/bundle/Resources/translations/dropdown.en.xliff rename to src/bundle/Resources/translations/ibexa_dropdown.en.xliff diff --git a/src/bundle/Resources/translations/fieldtypes_edit.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff similarity index 100% rename from src/bundle/Resources/translations/fieldtypes_edit.en.xliff rename to src/bundle/Resources/translations/ibexa_fieldtypes_edit.en.xliff diff --git a/src/bundle/Resources/translations/fieldtypes_preview.en.xliff b/src/bundle/Resources/translations/ibexa_fieldtypes_preview.en.xliff similarity index 100% rename from src/bundle/Resources/translations/fieldtypes_preview.en.xliff rename to src/bundle/Resources/translations/ibexa_fieldtypes_preview.en.xliff diff --git a/src/bundle/Resources/translations/fieldview.en.xliff b/src/bundle/Resources/translations/ibexa_fieldview.en.xliff similarity index 100% rename from src/bundle/Resources/translations/fieldview.en.xliff rename to src/bundle/Resources/translations/ibexa_fieldview.en.xliff diff --git a/src/bundle/Resources/translations/language.en.xliff b/src/bundle/Resources/translations/ibexa_language.en.xliff similarity index 100% rename from src/bundle/Resources/translations/language.en.xliff rename to src/bundle/Resources/translations/ibexa_language.en.xliff diff --git a/src/bundle/Resources/translations/linkmanager.en.xliff b/src/bundle/Resources/translations/ibexa_linkmanager.en.xliff similarity index 100% rename from src/bundle/Resources/translations/linkmanager.en.xliff rename to src/bundle/Resources/translations/ibexa_linkmanager.en.xliff diff --git a/src/bundle/Resources/translations/location.en.xliff b/src/bundle/Resources/translations/ibexa_location.en.xliff similarity index 100% rename from src/bundle/Resources/translations/location.en.xliff rename to src/bundle/Resources/translations/ibexa_location.en.xliff diff --git a/src/bundle/Resources/translations/locationview.en.xliff b/src/bundle/Resources/translations/ibexa_locationview.en.xliff similarity index 100% rename from src/bundle/Resources/translations/locationview.en.xliff rename to src/bundle/Resources/translations/ibexa_locationview.en.xliff diff --git a/src/bundle/Resources/translations/menu.en.xliff b/src/bundle/Resources/translations/ibexa_menu.en.xliff similarity index 100% rename from src/bundle/Resources/translations/menu.en.xliff rename to src/bundle/Resources/translations/ibexa_menu.en.xliff diff --git a/src/bundle/Resources/translations/modal.en.xliff b/src/bundle/Resources/translations/ibexa_modal.en.xliff similarity index 100% rename from src/bundle/Resources/translations/modal.en.xliff rename to src/bundle/Resources/translations/ibexa_modal.en.xliff diff --git a/src/bundle/Resources/translations/multi_file_upload.en.xliff b/src/bundle/Resources/translations/ibexa_multi_file_upload.en.xliff similarity index 100% rename from src/bundle/Resources/translations/multi_file_upload.en.xliff rename to src/bundle/Resources/translations/ibexa_multi_file_upload.en.xliff diff --git a/src/bundle/Resources/translations/notifications.en.xliff b/src/bundle/Resources/translations/ibexa_notifications.en.xliff similarity index 94% rename from src/bundle/Resources/translations/notifications.en.xliff rename to src/bundle/Resources/translations/ibexa_notifications.en.xliff index d6ff89c579..04f5c4acc1 100644 --- a/src/bundle/Resources/translations/notifications.en.xliff +++ b/src/bundle/Resources/translations/ibexa_notifications.en.xliff @@ -6,6 +6,11 @@ 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. + + Notifications + Notifications + key: ibexa_notifications + View Notifications View Notifications @@ -36,11 +41,6 @@ Type key: notification.type - - Notifications - Notifications - key: notifications - Cannot update notifications Cannot update notifications diff --git a/src/bundle/Resources/translations/object_state.en.xliff b/src/bundle/Resources/translations/ibexa_object_state.en.xliff similarity index 100% rename from src/bundle/Resources/translations/object_state.en.xliff rename to src/bundle/Resources/translations/ibexa_object_state.en.xliff diff --git a/src/bundle/Resources/translations/pagination.en.xliff b/src/bundle/Resources/translations/ibexa_pagination.en.xliff similarity index 100% rename from src/bundle/Resources/translations/pagination.en.xliff rename to src/bundle/Resources/translations/ibexa_pagination.en.xliff diff --git a/src/bundle/Resources/translations/policy.en.xliff b/src/bundle/Resources/translations/ibexa_policy.en.xliff similarity index 100% rename from src/bundle/Resources/translations/policy.en.xliff rename to src/bundle/Resources/translations/ibexa_policy.en.xliff diff --git a/src/bundle/Resources/translations/role.en.xliff b/src/bundle/Resources/translations/ibexa_role.en.xliff similarity index 100% rename from src/bundle/Resources/translations/role.en.xliff rename to src/bundle/Resources/translations/ibexa_role.en.xliff diff --git a/src/bundle/Resources/translations/search.en.xliff b/src/bundle/Resources/translations/ibexa_search.en.xliff similarity index 100% rename from src/bundle/Resources/translations/search.en.xliff rename to src/bundle/Resources/translations/ibexa_search.en.xliff diff --git a/src/bundle/Resources/translations/section.en.xliff b/src/bundle/Resources/translations/ibexa_section.en.xliff similarity index 100% rename from src/bundle/Resources/translations/section.en.xliff rename to src/bundle/Resources/translations/ibexa_section.en.xliff diff --git a/src/bundle/Resources/translations/sub_items.en.xliff b/src/bundle/Resources/translations/ibexa_sub_items.en.xliff similarity index 100% rename from src/bundle/Resources/translations/sub_items.en.xliff rename to src/bundle/Resources/translations/ibexa_sub_items.en.xliff diff --git a/src/bundle/Resources/translations/time_diff.en.xliff b/src/bundle/Resources/translations/ibexa_time_diff.en.xliff similarity index 100% rename from src/bundle/Resources/translations/time_diff.en.xliff rename to src/bundle/Resources/translations/ibexa_time_diff.en.xliff diff --git a/src/bundle/Resources/translations/trash.en.xliff b/src/bundle/Resources/translations/ibexa_trash.en.xliff similarity index 100% rename from src/bundle/Resources/translations/trash.en.xliff rename to src/bundle/Resources/translations/ibexa_trash.en.xliff diff --git a/src/bundle/Resources/translations/trash_ui.en.xliff b/src/bundle/Resources/translations/ibexa_trash_ui.en.xliff similarity index 100% rename from src/bundle/Resources/translations/trash_ui.en.xliff rename to src/bundle/Resources/translations/ibexa_trash_ui.en.xliff diff --git a/src/bundle/Resources/translations/universal_discovery_widget.en.xliff b/src/bundle/Resources/translations/ibexa_universal_discovery_widget.en.xliff similarity index 100% rename from src/bundle/Resources/translations/universal_discovery_widget.en.xliff rename to src/bundle/Resources/translations/ibexa_universal_discovery_widget.en.xliff diff --git a/src/bundle/Resources/translations/ezplatform_url_management.en.xliff b/src/bundle/Resources/translations/ibexa_url_management.en.xliff similarity index 100% rename from src/bundle/Resources/translations/ezplatform_url_management.en.xliff rename to src/bundle/Resources/translations/ibexa_url_management.en.xliff diff --git a/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff b/src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff similarity index 76% rename from src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff rename to src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff index 974e18b6d9..e10cb7ea0c 100644 --- a/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff +++ b/src/bundle/Resources/translations/ibexa_url_wildcard.en.xliff @@ -6,6 +6,11 @@ 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. + + URL wildcards + URL wildcards + key: tab.name.url_wildcards + Edit Edit @@ -21,6 +26,31 @@ URL management key: url_wildcard.breadcrumb.list + + Destination URL + Destination URL + key: url_wildcard.create.identifier + + + Source URL + Source URL + key: url_wildcard.create.source_url + + + Create + Create + key: url_wildcard.create.submit + + + URL Wildcard created. + URL Wildcard created. + key: url_wildcard.create.success + + + URL Wildcard(s) deleted. + URL Wildcard(s) deleted. + key: url_wildcard.delete.success + URL wildcards are disabled. Contact your Administrator. URL wildcards are disabled. Contact your Administrator. @@ -101,6 +131,11 @@ Forward key: url_wildcard.type.forward + + URL Wildcard updated. + URL Wildcard updated. + key: url_wildcard.update.success + diff --git a/src/bundle/Resources/translations/user_change_password.en.xliff b/src/bundle/Resources/translations/ibexa_user_change_password.en.xliff similarity index 100% rename from src/bundle/Resources/translations/user_change_password.en.xliff rename to src/bundle/Resources/translations/ibexa_user_change_password.en.xliff diff --git a/src/bundle/Resources/translations/user_create.en.xliff b/src/bundle/Resources/translations/ibexa_user_create.en.xliff similarity index 100% rename from src/bundle/Resources/translations/user_create.en.xliff rename to src/bundle/Resources/translations/ibexa_user_create.en.xliff diff --git a/src/bundle/Resources/translations/user_delete.en.xliff b/src/bundle/Resources/translations/ibexa_user_delete.en.xliff similarity index 100% rename from src/bundle/Resources/translations/user_delete.en.xliff rename to src/bundle/Resources/translations/ibexa_user_delete.en.xliff diff --git a/src/bundle/Resources/translations/user_edit.en.xliff b/src/bundle/Resources/translations/ibexa_user_edit.en.xliff similarity index 100% rename from src/bundle/Resources/translations/user_edit.en.xliff rename to src/bundle/Resources/translations/ibexa_user_edit.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/version_conflict.en.xliff b/src/bundle/Resources/translations/ibexa_version_conflict.en.xliff similarity index 100% rename from src/bundle/Resources/translations/version_conflict.en.xliff rename to src/bundle/Resources/translations/ibexa_version_conflict.en.xliff diff --git a/src/bundle/Resources/translations/translation.en.xliff b/src/bundle/Resources/translations/translation.en.xliff deleted file mode 100644 index f44179ece1..0000000000 --- a/src/bundle/Resources/translations/translation.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. -
- - - Removed '%languageCode%' translation from '%name%'. - Removed '%languageCode%' translation from '%name%'. - key: translation.remove.success - - -
-
diff --git a/src/bundle/Resources/translations/url_wildcard.en.xliff b/src/bundle/Resources/translations/url_wildcard.en.xliff deleted file mode 100644 index 5d6d6402c5..0000000000 --- a/src/bundle/Resources/translations/url_wildcard.en.xliff +++ /dev/null @@ -1,46 +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. -
- - - URL wildcards - URL wildcards - key: tab.name.url_wildcards - - - Destination URL - Destination URL - key: url_wildcard.create.identifier - - - Source URL - Source URL - key: url_wildcard.create.source_url - - - Create - Create - key: url_wildcard.create.submit - - - URL Wildcard created. - URL Wildcard created. - key: url_wildcard.create.success - - - URL Wildcard(s) deleted. - URL Wildcard(s) deleted. - key: url_wildcard.delete.success - - - URL Wildcard updated. - URL Wildcard updated. - key: url_wildcard.update.success - - -
-
diff --git a/src/bundle/Resources/translations/version.en.xliff b/src/bundle/Resources/translations/version.en.xliff deleted file mode 100644 index 81390aef5d..0000000000 --- a/src/bundle/Resources/translations/version.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. -
- - - Removed version(s) from '%name%'. - Removed version(s) from '%name%'. - key: version.delete.success - - -
-
diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig index d7db0bfb86..e066488001 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig @@ -2,7 +2,7 @@ {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} -{% trans_default_domain 'bookmark' %} +{% trans_default_domain 'ibexa_bookmark' %} {% form_theme form_remove '@ibexadesign/ui/form_fields.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig index 5ba6be149c..26fd936503 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %}
{{ pagination|raw }} diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/list_item.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/list_item.html.twig index 45076d356c..fe93cc00c0 100644 --- a/src/bundle/Resources/views/themes/admin/account/notifications/list_item.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/notifications/list_item.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'notifications' %} +{% trans_default_domain 'ibexa_notifications' %} {% if wrapper_class_list is not defined %} {% set wrapper_class_list = 'ibexa-notifications-modal__item' ~ (notification.isPending == 0 ? ' ibexa-notifications-modal__item--read') %} diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_deleted.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_deleted.html.twig index 47c989b7c1..97a9a41d33 100644 --- a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_deleted.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_deleted.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/account/notifications/list_item.html.twig' %} -{% trans_default_domain 'notifications' %} +{% trans_default_domain 'ibexa_notifications' %} {% set wrapper_additional_classes = 'ibexa-notifications-modal__item--permanently-deleted' %} diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_trashed.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_trashed.html.twig index 6008a1b84d..4b0224f459 100644 --- a/src/bundle/Resources/views/themes/admin/account/notifications/list_item_trashed.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/notifications/list_item_trashed.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/account/notifications/list_item.html.twig' %} -{% trans_default_domain 'notifications' %} +{% trans_default_domain 'ibexa_notifications' %} {% block icon %} diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig index ff3c040037..cf339a35d4 100644 --- a/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/notifications/modal.html.twig @@ -1,7 +1,7 @@ -{% trans_default_domain 'notifications' %} +{% trans_default_domain 'ibexa_notifications' %} {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with { - title: 'notifications'|trans|desc('Notifications'), + title: 'ibexa_notifications'|trans|desc('Notifications'), class: 'ibexa-notifications-modal', no_header_border: true, id: 'view-notifications', diff --git a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig index 853a647284..72ff19384c 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig @@ -1,6 +1,6 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'user_settings' %} +{% trans_default_domain 'ibexa_user_settings' %} {% block breadcrumbs %} {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig index 3117e9622e..5f6f172d09 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig @@ -1,7 +1,7 @@ {% set view_base_layout = '@ibexadesign/ui/layout.html.twig' %} {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'user_settings' %} +{% trans_default_domain 'ibexa_user_settings' %} {% block body_class %}ibexa-user-settings-update-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/account/settings/update_datetime_format.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/update_datetime_format.html.twig index b4447263a3..a714b69b2d 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/update_datetime_format.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/update_datetime_format.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/account/settings/update.html.twig' %} -{% trans_default_domain 'user_settings' %} +{% trans_default_domain 'ibexa_user_settings' %} {% block date_time_format_widget %} {{ block('form_widget') }} diff --git a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig index 28d14b4c4d..3e863ef8c0 100644 --- a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/layout.html.twig' %} -{% trans_default_domain 'content_preview' %} +{% trans_default_domain 'ibexa_content_preview' %} {% set is_published = content.contentInfo.published and content.contentInfo.mainLocationId is not null %} @@ -18,7 +18,7 @@ - {{ 'preview_header.back'|trans({}, 'content')|desc('Back') }} + {{ 'preview_header.back'|trans({}, 'ibexa_content')|desc('Back') }}
diff --git a/src/bundle/Resources/views/themes/admin/content/content_view_fields.html.twig b/src/bundle/Resources/views/themes/admin/content/content_view_fields.html.twig index 4a4baa2f20..4465255bfe 100644 --- a/src/bundle/Resources/views/themes/admin/content/content_view_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/content_view_fields.html.twig @@ -27,7 +27,7 @@
{{ field_definition.name }}
{% if ibexa_field_is_empty(content, field_definition.identifier) %} - {{ 'fieldview.field.empty'|trans({}, 'fieldview')|desc('This field is empty') }} + {{ 'fieldview.field.empty'|trans({}, 'ibexa_fieldview')|desc('This field is empty') }} {% else %} {{ ibexa_render_field(content, field_definition.identifier, {location: location}) }} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig index 31fa60302e..c4663504df 100644 --- a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/content/edit_base.html.twig' %} -{% trans_default_domain 'content_create' %} +{% trans_default_domain 'ibexa_content_create' %} {% block meta %} diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig index e0ba906a88..0a57c4dfef 100644 --- a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig @@ -2,7 +2,7 @@ {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} -{% trans_default_domain 'drafts' %} +{% trans_default_domain 'ibexa_drafts' %} {% form_theme form_remove '@ibexadesign/ui/form_fields.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig index 2715ea60e0..0994162b2b 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig @@ -1,5 +1,5 @@ {# @deprecated, will be removed in 5.0. #} -{% trans_default_domain 'content' %} +{% trans_default_domain 'ibexa_content' %} {% set is_autosave_enabled = ibexa_user_settings['autosave'] is same as('enabled') %} {% set form_has_autosave = form.autosave is defined %} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig index 42d2e9e717..92bcf3b58d 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/content/edit_base.html.twig' %} -{% trans_default_domain 'content_edit' %} +{% trans_default_domain 'ibexa_content_edit' %} {% block meta %} diff --git a/src/bundle/Resources/views/themes/admin/content/edit_base.html.twig b/src/bundle/Resources/views/themes/admin/content/edit_base.html.twig index d67b1a4a8b..d16fbcd4ea 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit_base.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit_base.html.twig @@ -2,7 +2,7 @@ {% import '@ibexadesign/content/edit_macros.html.twig' as edit_macros %} -{% trans_default_domain 'content_edit' %} +{% trans_default_domain 'ibexa_content_edit' %} {% set grouped_fields = grouped_fields|default([]) %} {% set anchor_params = { items: grouped_fields|keys } %} @@ -45,7 +45,7 @@ {% embed '@ibexadesign/ui/anchor_navigation_section.html.twig' with { anchor_section_key: 'ibexa-edit-content-sections-content-fields-' ~ key|lower, } %} - {% trans_default_domain 'content_edit' %} + {% trans_default_domain 'ibexa_content_edit' %} {% import '@ibexadesign/content/edit_macros.html.twig' as edit_macros %} {% block anchor_section_header %} diff --git a/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig b/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig index 0af8393319..677bc0a600 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig @@ -1,5 +1,5 @@ {% macro render_form_field(formField) -%} - {% trans_default_domain 'content_edit' %} + {% trans_default_domain 'ibexa_content_edit' %} {% if not formField.rendered %} {% if formField.value is defined %} diff --git a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig index 2773950a95..44d7dfdb3f 100644 --- a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig @@ -19,7 +19,7 @@ {% use '@ibexadesign/ui/field_type/edit/ezobjectrelation.html.twig' %} {% use '@ibexadesign/ui/field_type/edit/ezuser.html.twig' %} -{% trans_default_domain 'content_edit' %} +{% trans_default_domain 'ibexa_content_edit' %} {# general content editing theming #} diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig index 4b94ace7d5..822924f4a4 100644 --- a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig @@ -2,7 +2,7 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% form_theme form_location_copy '@ibexadesign/ui/form/flat_widgets.html.twig' %} {% form_theme form_location_move '@ibexadesign/ui/form/flat_widgets.html.twig' %} {% if form_content_edit is defined %} @@ -175,7 +175,7 @@ {% if content_has_reverse_relations and not location.contentInfo.isHidden %} {% include '@ibexadesign/content/modal/hide_confirmation.html.twig' %} {% endif %} - +
{% endblock %} {% block stylesheets %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig index bf2e609695..4bc3c801a7 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig @@ -1,11 +1,11 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with { title: 'tab.translations.add.title'|trans|desc('Create a new translation'), class: 'ibexa-translation', id: modal_id|default('add-translation-modal'), } %} - {% trans_default_domain 'locationview' %} + {% trans_default_domain 'ibexa_locationview' %} {% form_theme form '@ibexadesign/content/translation_add_form_fields.html.twig' %} {% block content_before %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig index f1c48164e8..5549dd46ad 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'draft_conflict' %} +{% trans_default_domain 'ibexa_draft_conflict' %} {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with { title: 'draft.conflict.header'|trans|desc('Draft conflict'), @@ -7,7 +7,7 @@ id: 'version-draft-conflict-modal', version_modal_draft_conflict: _self, } %} - {% trans_default_domain 'draft_conflict' %} + {% trans_default_domain 'ibexa_draft_conflict' %} {% import version_modal_draft_conflict as version_modal_draft_conflict_embed %} {% block body_content %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig index a4dfedd5f3..54c0d587ac 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/location_bulk_action_failed.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with { title: 'content.view.subitems.bulk_action.limited_permissions'|trans|desc('Limited user permissions'), @@ -6,7 +6,7 @@ no_header_border: true, id: 'bulk-action-failed-modal', } %} - {% trans_default_domain 'locationview' %} + {% trans_default_domain 'ibexa_locationview' %} {% block body_content %} {% set table_row_template %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig index 77786b6c66..95839d80de 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/user_delete.html.twig @@ -3,7 +3,7 @@ no_header: true, id: 'delete-user-modal', } %} - {% trans_default_domain 'user_delete' %} + {% trans_default_domain 'ibexa_user_delete' %} {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} {% block body_content %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig index 1b442dfc03..ac28e89b22 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig @@ -1,11 +1,11 @@ {% extends '@ibexadesign/user/invitation/modal.html.twig' %} {% form_theme form '@ibexadesign/content/modal/user_group_invitation_modal_form_fields.html.twig' %} -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% block entries %} {% form_theme form '@ibexadesign/content/modal/user_group_invitation_modal_form_fields.html.twig' %} - {% trans_default_domain 'locationview' %} + {% trans_default_domain 'ibexa_locationview' %} {% for emails in form.emails %} {{ form_widget(emails) }} @@ -14,13 +14,13 @@ {% block entry_prototype %} {% form_theme form '@ibexadesign/content/modal/user_group_invitation_modal_form_fields.html.twig' %} - {% trans_default_domain 'locationview' %} + {% trans_default_domain 'ibexa_locationview' %} {{ form_widget(form.children.emails.vars.prototype) }} {% endblock %} {% block entries_labels %} - {% trans_default_domain 'locationview' %} + {% trans_default_domain 'ibexa_locationview' %}
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/policies/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/policies/tab.html.twig index c2fffb206e..8854908571 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/policies/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/policies/tab.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'policy' %} +{% trans_default_domain 'ibexa_policy' %} {% import _self as tab %} {% set body_rows = [] %} @@ -42,7 +42,7 @@ class="font-weight-bold" title="{{ 'policy.limitation.identifier_tooltip'|trans({'%identifier%': limitation.identifier})|desc('"%identifier%" Limitation') }}" > - {{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ezplatform_content_forms_policies')|desc('%identifier%') }}: + {{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ibexa_content_forms_policies')|desc('%identifier%') }}: {{ ibexa_render_limitation_value(limitation, {'template': '@ibexadesign/content/tab/policies/limitation_values.html.twig'}) }} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/relations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/relations/tab.html.twig index 635231f956..691898f989 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/relations/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/relations/tab.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %}
{{ include('@ibexadesign/content/tab/relations/table_relations.html.twig', { diff --git a/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations.html.twig index 59d3be6f00..2bdd347e32 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% import _self as macros %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations_reverse.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations_reverse.html.twig index 7a900c72cf..64da8ccf8f 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations_reverse.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/relations/table_relations_reverse.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% import _self as macros %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/roles/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/roles/tab.html.twig index 06c7b79e8a..1f38e9ba37 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/roles/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/roles/tab.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% import _self as tab %} {{ include('@ibexadesign/content/tab/roles/table.html.twig', { diff --git a/src/bundle/Resources/views/themes/admin/content/tab/roles/table.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/roles/table.html.twig index a23b6f96a6..c29bd0c772 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/roles/table.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/roles/table.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% set body_rows = [] %} {% if roles_pager.currentPageResults is not empty %} @@ -20,7 +20,7 @@ {%- if limitation -%} {{ ibexa_render_limitation_value(limitation, {'template': '@ibexadesign/content/tab/roles/limitation_values.html.twig'}) }} - ({{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ezplatform_content_forms_policies')|desc('%identifier%') }}) + ({{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ibexa_content_forms_policies')|desc('%identifier%') }}) {%- else -%} {{- 'policy.limitation.none'|trans|desc('None') -}} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig index f2af855485..5db8da0f66 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'locationview' %} +{% trans_default_domain 'ibexa_locationview' %} {% form_theme form_translation_remove with ['@ibexadesign/ui/form/flat_widgets.html.twig', '@ibexadesign/ui/form_fields.html.twig'] %} @@ -102,7 +102,6 @@
diff --git a/src/bundle/Resources/views/themes/admin/content_type/index.html.twig b/src/bundle/Resources/views/themes/admin/content_type/index.html.twig index 87873c3b8c..58d8f9f486 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/index.html.twig @@ -1,6 +1,6 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'content_type' %} +{% trans_default_domain 'ibexa_content_type' %} {% block body_class %}ibexa-content-type-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content_type/list.html.twig b/src/bundle/Resources/views/themes/admin/content_type/list.html.twig index f57363e954..7edf58c189 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/list.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'content_type' %} +{% trans_default_domain 'ibexa_content_type' %} {% import "@ibexadesign/content_type/macros.html.twig" as macros %} {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} diff --git a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig index 70c1d3c314..7e8cf6c11c 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'content_type' %} +{% trans_default_domain 'ibexa_content_type' %} {% macro content_type_edit(content_type, content_type_group, class_name) %} {% set edit_url = path('ibexa.content_type.edit', { diff --git a/src/bundle/Resources/views/themes/admin/content_type/part/field_definition_form.html.twig b/src/bundle/Resources/views/themes/admin/content_type/part/field_definition_form.html.twig index cd0decabe8..68c6c48860 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/part/field_definition_form.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/part/field_definition_form.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'content_type' %} +{% trans_default_domain 'ibexa_content_type' %} {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/content_type/part/nontranslatable_fields_disabled.html.twig b/src/bundle/Resources/views/themes/admin/content_type/part/nontranslatable_fields_disabled.html.twig index 3394c12bf9..f5fa061a99 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/part/nontranslatable_fields_disabled.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/part/nontranslatable_fields_disabled.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'content_type' %} +{% trans_default_domain 'ibexa_content_type' %}
{% include '@ibexadesign/ui/component/alert/alert.html.twig' with { diff --git a/src/bundle/Resources/views/themes/admin/content_type/relation_form_fields.html.twig b/src/bundle/Resources/views/themes/admin/content_type/relation_form_fields.html.twig index 600009789e..b7706248ef 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/relation_form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/relation_form_fields.html.twig @@ -12,7 +12,7 @@ >
{{ 'content_type.edit.select_language'|trans|desc('Select a language:') }}
diff --git a/src/bundle/Resources/views/themes/admin/language/base.html.twig b/src/bundle/Resources/views/themes/admin/language/base.html.twig index ae12c3fc6b..555b495146 100644 --- a/src/bundle/Resources/views/themes/admin/language/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'language' %} +{% trans_default_domain 'ibexa_language' %} {% block main_container_class %}ibexa-main-container--edit-container ibexa-main-container--without-anchor-menu-items{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/language/create.html.twig b/src/bundle/Resources/views/themes/admin/language/create.html.twig index 077a6581e9..4dd2aa1653 100644 --- a/src/bundle/Resources/views/themes/admin/language/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/create.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'language' %} +{% trans_default_domain 'ibexa_language' %} {% block header_admin %} {% set language_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.language_create.sidebar_right') %} diff --git a/src/bundle/Resources/views/themes/admin/language/edit.html.twig b/src/bundle/Resources/views/themes/admin/language/edit.html.twig index 3f31aa083d..d84f1354fc 100644 --- a/src/bundle/Resources/views/themes/admin/language/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/edit.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'language' %} +{% trans_default_domain 'ibexa_language' %} {% block header_admin %} {% set language_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.language_edit.sidebar_right', [], {'save_id': form.save.vars.id}) %} diff --git a/src/bundle/Resources/views/themes/admin/language/index.html.twig b/src/bundle/Resources/views/themes/admin/language/index.html.twig index 2cc5a87fb4..5c7ac32078 100644 --- a/src/bundle/Resources/views/themes/admin/language/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/index.html.twig @@ -2,7 +2,7 @@ {% form_theme deleteForm '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'language' %} +{% trans_default_domain 'ibexa_language' %} {% block body_class %}ibexa-language-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/language/list.html.twig b/src/bundle/Resources/views/themes/admin/language/list.html.twig index 9b037a569f..ceb7c0b195 100644 --- a/src/bundle/Resources/views/themes/admin/language/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/list.html.twig @@ -4,7 +4,7 @@ {% form_theme form_languages_delete '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'language' %} +{% trans_default_domain 'ibexa_language' %} {% block body_class %}ibexa-language-list-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig index 892e5c8406..8cb206e3a5 100644 --- a/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig @@ -3,7 +3,7 @@ no_header: true, id: 'delete-language-modal', } %} - {% trans_default_domain 'language' %} + {% trans_default_domain 'ibexa_language' %} {% block body_content %}

{{ 'language.modal.message'|trans|desc('Delete the languages?') }}

diff --git a/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig b/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig index f09db8afb3..b586e89c5d 100644 --- a/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig +++ b/src/bundle/Resources/views/themes/admin/limitation/limitation_values.html.twig @@ -127,7 +127,7 @@ {% apply spaceless %}
{{ "role.policy.limitation.userpermissions.role_title" - |trans({}, "ezplatform_content_forms_role") + |trans({}, 'ibexa_content_forms_role') |desc("Roles:") }} {% if values['roles'] is empty %} {{- 'policy.limitation.none'|trans|desc('None') -}} @@ -137,7 +137,7 @@ {% endfor %}
{{ "role.policy.limitation.userpermissions.user_groups_title" - |trans({}, "ezplatform_content_forms_role") + |trans({}, 'ibexa_content_forms_role') |desc("User Groups:") }} {% if values['user_groups'] is empty %} {{- 'policy.limitation.none'|trans|desc('None') -}} diff --git a/src/bundle/Resources/views/themes/admin/limitation/null_limitation_values.html.twig b/src/bundle/Resources/views/themes/admin/limitation/null_limitation_values.html.twig index 25b3664c8e..e4ae5336c3 100644 --- a/src/bundle/Resources/views/themes/admin/limitation/null_limitation_values.html.twig +++ b/src/bundle/Resources/views/themes/admin/limitation/null_limitation_values.html.twig @@ -1,5 +1,5 @@ {% do form.setRendered() %} {{ form_label(form) }} {{ "role.policy.limitation.not_implemented" - |trans({"%limitationTypeIdentifier%": form.vars.data.identifier}, 'ezplatform_content_forms_role') + |trans({"%limitationTypeIdentifier%": form.vars.data.identifier}, 'ibexa_content_forms_role') |desc("Editing Limitations for '%limitationTypeIdentifier%' is not available.") }} diff --git a/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig b/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig index 6396733b29..79d0021a7a 100755 --- a/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig +++ b/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig @@ -4,7 +4,7 @@ {{ form_widget(form.limitationValues) }}
    @@ -39,7 +39,7 @@
  • - {{ "role.policy.limitation.location_deleted"|trans({}, "ezplatform_content_forms_role")|desc("Location deleted") }} + {{ "role.policy.limitation.location_deleted"|trans({}, 'ibexa_content_forms_role')|desc("Location deleted") }}
  • diff --git a/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig index 4cc954db8c..3163e8e3de 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/edit.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain "linkmanager" %} +{% trans_default_domain 'ibexa_linkmanager' %} {% set anchor_params = { close_href: path('ibexa.url_management'), diff --git a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig index cf1aea171d..8397939780 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig @@ -1,6 +1,6 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain "linkmanager" %} +{% trans_default_domain 'ibexa_linkmanager' %} {%- block content -%}
    diff --git a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig index f7a86d6ca9..c421b93c7a 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/layout.html.twig' %} -{% trans_default_domain "linkmanager" %} +{% trans_default_domain 'ibexa_linkmanager' %} {%- block breadcrumbs -%} {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/object_state/add.html.twig b/src/bundle/Resources/views/themes/admin/object_state/add.html.twig index b712e9da34..f3980fd3ed 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/add.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block header_admin %} {% set object_state_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.object_state_create.sidebar_right', [], {'group_id': object_state_group.id}) %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/base.html.twig b/src/bundle/Resources/views/themes/admin/object_state/base.html.twig index 437a1fa606..1dfbb4f342 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% set anchor_params = { close_href: path('ibexa.object_state.groups.list'), diff --git a/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig b/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig index 818114c562..bfa7a4d1d6 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block header_admin %} {% set object_state_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.object_state_edit.sidebar_right', [], {'group_id': object_state_group.id, 'save_id': form.save.vars.id}) %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/list.html.twig b/src/bundle/Resources/views/themes/admin/object_state/list.html.twig index a161dc4dfb..864ab1b529 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/list.html.twig @@ -2,7 +2,7 @@ {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block content %} {% set body_rows = [] %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig index 02790e7149..2f45519438 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block header_admin %} {% set object_state_group_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.object_state_group_create.sidebar_right') %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/base.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/base.html.twig index 437a1fa606..1dfbb4f342 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% set anchor_params = { close_href: path('ibexa.object_state.groups.list'), diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig index 91cee0293c..5ee92aaf95 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block header_admin %} {% set object_state_group_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.object_state_group_edit.sidebar_right', [], {'save_id': form.save.vars.id}) %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig index b9fb7be2d6..ad8151216f 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig @@ -4,7 +4,7 @@ {% form_theme form_state_groups_delete '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block body_class %}ibexa-object-state-group-list-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig index 88a4b4c6d3..3ac93fc78a 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig @@ -1,6 +1,6 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block body_class %}ibexa-object-state-group-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/object_state/view.html.twig b/src/bundle/Resources/views/themes/admin/object_state/view.html.twig index 0ff2dafd4b..ceb0b9acaa 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/view.html.twig @@ -1,6 +1,6 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'object_state' %} +{% trans_default_domain 'ibexa_object_state' %} {% block body_class %}ibexa-object-state-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/section/assigned_content.html.twig b/src/bundle/Resources/views/themes/admin/section/assigned_content.html.twig index de1123bdef..989f9ede97 100644 --- a/src/bundle/Resources/views/themes/admin/section/assigned_content.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/assigned_content.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'section' %} +{% trans_default_domain 'ibexa_section' %} {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} diff --git a/src/bundle/Resources/views/themes/admin/section/base.html.twig b/src/bundle/Resources/views/themes/admin/section/base.html.twig index c81ff766a9..78c1e9c036 100644 --- a/src/bundle/Resources/views/themes/admin/section/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'section' %} +{% trans_default_domain 'ibexa_section' %} {% set anchor_params = { close_href: path('ibexa.section.list'), diff --git a/src/bundle/Resources/views/themes/admin/section/create.html.twig b/src/bundle/Resources/views/themes/admin/section/create.html.twig index a9e154377d..5f0e27aa44 100644 --- a/src/bundle/Resources/views/themes/admin/section/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/create.html.twig @@ -2,7 +2,7 @@ {% form_theme form_section_create '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'section' %} +{% trans_default_domain 'ibexa_section' %} {% block header_admin %} {% set section_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.section_create.sidebar_right') %} diff --git a/src/bundle/Resources/views/themes/admin/section/list.html.twig b/src/bundle/Resources/views/themes/admin/section/list.html.twig index 666ff19058..5e26c1350d 100644 --- a/src/bundle/Resources/views/themes/admin/section/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/list.html.twig @@ -5,7 +5,7 @@ {% form_theme form_sections_delete '@ibexadesign/ui/form_fields.html.twig' %} {% form_theme form_section_content_assign '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'section' %} +{% trans_default_domain 'ibexa_section' %} {% block body_class %}ibexa-section-list-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/section/update.html.twig b/src/bundle/Resources/views/themes/admin/section/update.html.twig index aae888dab8..e55964a6c2 100644 --- a/src/bundle/Resources/views/themes/admin/section/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/update.html.twig @@ -2,7 +2,7 @@ {% form_theme form_section_update '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'section' %} +{% trans_default_domain 'ibexa_section' %} {% block header_admin %} {% set section_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.section_edit.sidebar_right', [], {'section': section}) %} diff --git a/src/bundle/Resources/views/themes/admin/section/view.html.twig b/src/bundle/Resources/views/themes/admin/section/view.html.twig index f9cf4cefee..4d2b7621bc 100644 --- a/src/bundle/Resources/views/themes/admin/section/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/view.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/layout.html.twig' %} -{% trans_default_domain 'section' %} +{% trans_default_domain 'ibexa_section' %} {% block body_class %}ibexa-section-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig index 53135c40de..d7c0d17e4f 100644 --- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig @@ -2,7 +2,7 @@ {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} -{% trans_default_domain 'trash' %} +{% trans_default_domain 'ibexa_trash' %} {% form_theme form_trash_item_restore '@ibexadesign/ui/form_fields.html.twig' %} {% form_theme form_trash_item_delete '@ibexadesign/ui/form_fields.html.twig' %} @@ -52,7 +52,7 @@ class: 'ibexa-trash-search-form' } } %} - {% trans_default_domain 'trash' %} + {% trans_default_domain 'ibexa_trash' %} {% block static_left_input %}
    @@ -258,14 +258,14 @@ 'data-udw-config': ibexa_udw_config('single_container', {}), 'class': (form_trash_item_restore.location.select_content.vars.attr.class|default('') ~ ' btn ibexa-btn ibexa-btn--ghost ibexa-btn--small')|trim, 'disabled': true - }, 'label': 'trash.button.restore_new_location'|trans({},'trash')|desc("Restore in a new location") + }, 'label': 'trash.button.restore_new_location'|trans({},'ibexa_trash')|desc("Restore in a new location") }) %} {{ form_widget(form_trash_item_restore.location.select_content, restore_under_new_parent_button_attr) }} {{ form_widget(form_trash_item_restore.location.location) }} {% do form_trash_item_restore.location.setRendered %} {{ form_widget(form_trash_item_restore.restore, { 'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}, - 'label': 'trash.button.restore'|trans({},'trash')|desc('Restore') + 'label': 'trash.button.restore'|trans({},'ibexa_trash')|desc('Restore') }) }} {% else %} {% do form_trash_item_restore.location.setRendered %} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig index aab8dda3de..7ca4ee5cfa 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/adaptive_filters/adaptive_filters.html.twig @@ -1,6 +1,6 @@ {% import '@ibexadesign/ui/component/macros.html.twig' as html %} -{% trans_default_domain 'adaptive_filters' %} +{% trans_default_domain 'ibexa_adaptive_filters' %} {% if filters_id is defined %} {% set expanded_info_cookie_name = 'ibexa_adaptive_filters-is_expanded-' ~ filters_id %} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig index 90121c5de4..68416c7320 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dropdown' %} +{% trans_default_domain 'ibexa_dropdown' %} {% import "@ibexadesign/ui/component/macros.html.twig" as html %} {% set choices_flat = choices diff --git a/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig index 6c7fcd38e4..5b669cb280 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig @@ -50,8 +50,8 @@ class: ('modal-title ' ~ attr_title.class|default(''))|trim, }) %} -{% set close_btn_title = 'close_btn.title'|trans({}, 'modal')|desc('Close') %} -{% set close_btn_aria_label = 'close_btn.aria_label'|trans({}, 'modal')|desc('Close') %} +{% set close_btn_title = 'close_btn.title'|trans({}, 'ibexa_modal')|desc('Close') %} +{% set close_btn_aria_label = 'close_btn.aria_label'|trans({}, 'ibexa_modal')|desc('Close') %} {% set attr_close_btn = attr_close_btn|default({})|merge({ class: ('close ' ~ attr_close_btn.class|default(''))|trim, type: attr_close_btn.type|default('button'), diff --git a/src/bundle/Resources/views/themes/admin/ui/component/preview_unavailable.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/preview_unavailable.html.twig index f12c590ad3..25e87033e9 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/preview_unavailable.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/preview_unavailable.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'content_edit_component_preview_unavailable' %} +{% trans_default_domain 'ibexa_content_preview' %} {% include '@ibexadesign/ui/component/alert/alert.html.twig' with { type: 'warning', diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig index a87ca88d26..5f9399a5c6 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/all.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %}
    {{ 'everyone'|trans|desc('Common content') }}
    diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig index 627f1cf560..6d28b942db 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/block/me.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %}
    {{ 'me'|trans|desc('My content') }}
    diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig index 9112f64487..37f302b87d 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/layout.html.twig' %} -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %} {% block body_class %}ibexa-dashboard{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig index 5c16ec42ba..86b06b3e50 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %} {% import "@ibexadesign/ui/dashboard/macros.html.twig" as macros %} {% set body_rows = [] %} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig index bd1dfa004f..4041fe1bae 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %} {% import "@ibexadesign/ui/dashboard/macros.html.twig" as macros %} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig index 452cef3cb8..2fa1ce4809 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %} {% import "@ibexadesign/ui/dashboard/macros.html.twig" as macros %} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig index 96081ddd22..78a6c9c7bc 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %} {% set body_rows = [] %} {% for row in data %} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_media.html.twig index c098bf47cb..ab46ea57a3 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_media.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_media.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'dashboard' %} +{% trans_default_domain 'ibexa_dashboard' %} {% import "@ibexadesign/ui/dashboard/macros.html.twig" as macros %} diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig index 3711f51a1b..e0c009adfd 100644 --- a/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/edit_translation_button.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'edit_translation_button' %} +{% trans_default_domain 'ibexa_admin_ui' %} {% set title = title ?? 'edit_translation.edit.title'|trans|desc('Edit') %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base.html.twig index ea928eca78..0a352b4996 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/binary_base.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% block binary_base_row %} {% if not file_is_empty is defined %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezbinaryfile.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezbinaryfile.html.twig index 6fd4432950..9f799e1c29 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezbinaryfile.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezbinaryfile.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% use '@ibexadesign/ui/field_type/edit/binary_base.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezgmaplocation.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezgmaplocation.html.twig index 6fcd2148f2..a11d0dea41 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezgmaplocation.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezgmaplocation.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {%- block ezplatform_fieldtype_ezgmaplocation_widget -%} {% set readonly = attr.readonly|default(false) %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig index c3eeb7822a..e77f8ec2dc 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% use '@ibexadesign/ui/field_type/edit/binary_base.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig index f95765b216..74570df0b6 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% use '@ibexadesign/ui/field_type/edit/binary_base.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezmedia.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezmedia.html.twig index 25cb4e0355..444ef09823 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezmedia.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezmedia.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% use '@ibexadesign/ui/field_type/edit/binary_base.html.twig' %} @@ -67,7 +67,7 @@
    {{ form_row(form.hasController, {'label_attr': {'class': 'checkbox-inline'}, attr: { disabled: readonly }}) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelation.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelation.html.twig index ad5feb9c81..a511b2e9cb 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelation.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelation.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% use '@ibexadesign/ui/field_type/edit/relation_base.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelationlist.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelationlist.html.twig index 9519f50845..c02202ec45 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelationlist.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezobjectrelationlist.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% use '@ibexadesign/ui/field_type/edit/relation_base.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig index 7e8525742f..38dfe8cc71 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/relation_base.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'ezplatform_content_forms_content' %} +{% trans_default_domain 'ibexa_content_forms_content' %} {% block ezobjectrelation_base_widget %} {% set limit = limit|default(0) %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig index 3253609aa5..df53a8ec63 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig @@ -1,6 +1,6 @@ {% extends '@IbexaCore/content_fields.html.twig' %} -{% trans_default_domain 'fieldtypes_preview' %} +{% trans_default_domain 'ibexa_fieldtypes_preview' %} {% block ezauthor_field %} {% apply spaceless %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezimageasset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezimageasset.html.twig index 3ad59efca4..797f80c257 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezimageasset.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezimageasset.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'fieldtypes_preview' %} +{% trans_default_domain 'ibexa_fieldtypes_preview' %} {% set field = ibexa_field(content, ibexa_content_field_identifier_image_asset()) %} {% set versionInfo = content.versionInfo %} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezobjectrelationlist_row.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezobjectrelationlist_row.html.twig index 86470be0c0..39df4a274c 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezobjectrelationlist_row.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/ezobjectrelationlist_row.html.twig @@ -4,7 +4,7 @@ {% endif %}> {{ content.getName() }} {% if content.contentInfo.trashed %} - ({{ 'content.in_trash'|trans(domain='content')|desc('In Trash') }}) + ({{ 'content.in_trash'|trans(domain='ibexa_content')|desc('In Trash') }}) {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig index 673ef67f61..7a182fba64 100644 --- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig @@ -231,13 +231,13 @@ {%- endblock table_header_tool_btn -%} {%- block _bookmark_remove_remove_widget -%} - {%- set title = 'bookmark.button.remove'|trans({},'bookmark')|desc('Delete') -%} + {%- set title = 'bookmark.button.remove'|trans({},'ibexa_bookmark')|desc('Delete') -%} {%- set icon = 'trash' -%} {{ block('table_header_tool_btn') }} {%- endblock -%} {%- block _content_remove_remove_widget -%} - {%- set title = 'drafts.list.action.remove'|trans({},'drafts')|desc('Remove') -%} + {%- set title = 'drafts.list.action.remove'|trans({},'ibexa_drafts')|desc('Remove') -%} {%- set icon = 'trash' -%} {{ block('table_header_tool_btn') }} {%- endblock -%} @@ -295,7 +295,7 @@ {% include '@ibexadesign/ui/component/inputs/input_date_time_picker.html.twig' with { input_attr: { class: "ibexa-filters__range-select", - placeholder: 'search.date.range'|trans({}, 'search')|desc('From date - to date'), + placeholder: 'search.date.range'|trans({}, 'ibexa_search')|desc('From date - to date'), 'data-start': form.parent.vars.data.lastModified.start_date is defined ? form.parent.vars.data.lastModified.start_date|date("Y-m-d") : '', 'data-end': form.parent.vars.data.lastModified.end_date is defined ? form.parent.vars.data.lastModified.end_date|date("Y-m-d") : '', @@ -314,7 +314,7 @@ {% include '@ibexadesign/ui/component/inputs/input_date_time_picker.html.twig' with { input_attr: { class: "ibexa-filters__range-select", - placeholder: 'search.date.range'|trans({}, 'search')|desc('From date - to date'), + placeholder: 'search.date.range'|trans({}, 'ibexa_search')|desc('From date - to date'), 'data-start': form.parent.vars.data.created.start_date is defined ? form.parent.vars.data.created.start_date|date("Y-m-d") : '', 'data-end': form.parent.vars.data.created.end_date is defined ? form.parent.vars.data.created.end_date|date("Y-m-d") : '', @@ -333,7 +333,7 @@ {% include '@ibexadesign/ui/component/inputs/input_date_time_picker.html.twig' with { input_attr: { class: "ibexa-trash-search-form__range-select", - placeholder: 'search.date.range'|trans({}, 'search')|desc('From date - to date'), + placeholder: 'search.date.range'|trans({}, 'ibexa_search')|desc('From date - to date'), 'data-start': form.parent.vars.data.trashedInterval.start_date is defined ? form.parent.vars.data.trashedInterval.start_date|date("Y-m-d") : '', 'data-end': form.parent.vars.data.trashedInterval.end_date is defined ? form.parent.vars.data.trashedInterval.end_date|date("Y-m-d") : '', @@ -452,7 +452,7 @@ {% block content_type_field_definition_widget -%} {{- form_row(form.enabled, { label: 'meta.enabled'|trans({ '%type%': form.name.vars.value, - }, 'content_type')|desc('Enable %type% for this Content Type') }) -}} + }, 'ibexa_content_type')|desc('Enable %type% for this Content Type') }) -}} {% for form_field in form.children %} {% if form_field.isRendered() == false %} diff --git a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/create_on_the_fly.html.twig b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/create_on_the_fly.html.twig index a4c19fc49b..0b63893b6f 100644 --- a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/create_on_the_fly.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/create_on_the_fly.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/content/edit_base.html.twig' %} -{% trans_default_domain 'content_create' %} +{% trans_default_domain 'ibexa_content_create' %} {% block main_container_class %}{{ parent() }} ibexa-main-container--no-border{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig index 0df6b2ec9c..3fd42a2c8c 100644 --- a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/content/edit_base.html.twig' %} -{% trans_default_domain 'content_edit' %} +{% trans_default_domain 'ibexa_content_edit' %} {% block main_container_class %}{{ parent() }} ibexa-main-container--no-border{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/ui/pagination.html.twig b/src/bundle/Resources/views/themes/admin/ui/pagination.html.twig index 0fcceef500..931546a95a 100644 --- a/src/bundle/Resources/views/themes/admin/ui/pagination.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/pagination.html.twig @@ -5,7 +5,7 @@
    {{ 'pagination.viewing'|trans({ '%viewing%': pager.currentPageResults|length, - '%total%': pager.nbResults}, 'pagination')|desc('Viewing %viewing% out of %total% items')|raw + '%total%': pager.nbResults}, 'ibexa_pagination')|desc('Viewing %viewing% out of %total% items')|raw }}
    {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig index e9a09c118e..2e41198f1e 100644 --- a/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'search' %} +{% trans_default_domain 'ibexa_search' %}
    {% if form.content_types.vars.data is not empty %} diff --git a/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig index 712e45cd06..1ac79ea562 100644 --- a/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/search/filters.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'search' %} +{% trans_default_domain 'ibexa_search' %}
    @@ -47,7 +47,7 @@ {% set creator = form.vars.data.creator %} {% embed '@ibexadesign/ui/component/input_text.html.twig' with { has_search: false } %} - {% trans_default_domain 'search' %} + {% trans_default_domain 'ibexa_search' %} {% block content %} {% if form.children.search_language.vars.value != '' %} diff --git a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig index db87fcf73a..dec554f3a9 100644 --- a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig @@ -1,6 +1,6 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'ezplatform_url_management' %} +{% trans_default_domain 'ibexa_url_management' %} {% block body_class %}ibexa-url-management{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig index e8d66a077f..df7390fd8c 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain "ezplatform_url_wildcard" %} +{% trans_default_domain 'ibexa_url_wildcard' %} {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig index 868f692661..999906e64d 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/modal_create.html.twig @@ -1,11 +1,11 @@ -{% trans_default_domain 'ezplatform_url_wildcard' %} +{% trans_default_domain 'ibexa_url_wildcard' %} {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with { title: 'url_wildcard.modal.create.title'|trans|desc('Create a new URL wildcard'), class: 'ibexa-modal--url-wildcards', id, } %} - {% trans_default_domain 'ezplatform_url_wildcard' %} + {% trans_default_domain 'ibexa_url_wildcard' %} {% form_theme form '@ibexadesign/content/form_fields.html.twig' '@ibexadesign/content/tab/url/checkbox.html.twig' %} {% block content_before %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig index 77cc2df298..8761ee5218 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/layout.html.twig' %} -{% trans_default_domain 'ezplatform_url_wildcard' %} +{% trans_default_domain 'ibexa_url_wildcard' %} {% form_theme form '@ibexadesign/content/form_fields.html.twig' '@ibexadesign/content/tab/url/checkbox.html.twig' %} {% block breadcrumbs %} diff --git a/src/bundle/Resources/views/themes/admin/user/create.html.twig b/src/bundle/Resources/views/themes/admin/user/create.html.twig index c06056add8..bb7cf44902 100644 --- a/src/bundle/Resources/views/themes/admin/user/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/create.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/content/edit_base.html.twig' %} -{% trans_default_domain 'user_create' %} +{% trans_default_domain 'ibexa_user_create' %} {% block meta %} diff --git a/src/bundle/Resources/views/themes/admin/user/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/edit.html.twig index 121f0f6edd..5def64232d 100644 --- a/src/bundle/Resources/views/themes/admin/user/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/edit.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/content/edit_base.html.twig' %} -{% trans_default_domain 'user_edit' %} +{% trans_default_domain 'ibexa_user_edit' %} {% block meta %} diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig index 2aa2641858..9c6691af68 100644 --- a/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/invitation/issue_duplicate.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'user_invitation' %} +{% trans_default_domain 'ibexa_user_invitation' %} diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig index 5f10194e1d..05044113f4 100644 --- a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_empty.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'user_invitation' %} +{% trans_default_domain 'ibexa_user_invitation' %} diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig index 3b0d6ab72f..47c013cb8c 100644 --- a/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/invitation/issue_email_not_valid.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'user_invitation' %} +{% trans_default_domain 'ibexa_user_invitation' %} diff --git a/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig b/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig index 0978a84e1a..343f3ff4bc 100644 --- a/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/invitation/modal.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'user_invitation' %} +{% trans_default_domain 'ibexa_user_invitation' %} {% set top_input_content %} {% block top_input_content %} @@ -29,7 +29,7 @@ id: 'ibexa-user-invitation-modal', } %} {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} - {% trans_default_domain 'user_invitation' %} + {% trans_default_domain 'ibexa_user_invitation' %} {% block content_before %} {{ form_start(form, { @@ -48,7 +48,7 @@ class: 'ibexa-user-invitation-modal__bad-file-alert ibexa-user-invitation-modal__bad-file-alert--hidden', show_close_btn: true, } only %} - {% trans_default_domain 'user_invitation' %} + {% trans_default_domain 'ibexa_user_invitation' %} {% block title %}
    @@ -64,7 +64,7 @@ class: 'ibexa-user-invitation-modal__issues-alert ibexa-user-invitation-modal__issues-alert--hidden', show_close_btn: true, } only %} - {% trans_default_domain 'user_invitation' %} + {% trans_default_domain 'ibexa_user_invitation' %} {% block extra_content %}
    @@ -81,7 +81,7 @@ {% endblock %} {% endembed %} {% embed '@ibexadesign/ui/component/input_text.html.twig' with { has_search: true, search_button_type: 'button' } %} - {% trans_default_domain 'user_invitation' %} + {% trans_default_domain 'ibexa_user_invitation' %} {% block content %} {{ top_input_content }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/add.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/add.html.twig index eb77121557..ccc939f146 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/add.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set policy_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.policy_create.sidebar_right', [], {'role': role}) %} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/base.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/base.html.twig index dd004c9e72..7496631a91 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% set anchor_params = { close_href: path('ibexa.role.view', {roleId: role.id}), diff --git a/src/bundle/Resources/views/themes/admin/user/policy/create_with_limitation.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/create_with_limitation.html.twig index 4dc4475371..ee6f21ba0f 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/create_with_limitation.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/create_with_limitation.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set policy_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.policy_edit.sidebar_right', [], {'role': role, 'save_id': form.save.vars.id}) %} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig index 82ca8bf28d..732e40cf12 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set policy_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.policy_edit.sidebar_right', [], {'role': role, 'save_id': form.save.vars.id}) %} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig index d959f6adb5..72fbfab2e4 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/list.html.twig @@ -1,4 +1,4 @@ -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} @@ -36,7 +36,7 @@ class="font-weight-bold" title="{{ 'policy.limitation.identifier_tooltip'|trans({'%identifier%': limitation.identifier})|desc('"%identifier%" Limitation') }}" > - {{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ezplatform_content_forms_policies')|desc('%identifier%') }}: + {{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ibexa_content_forms_policies')|desc('%identifier%') }}: {{ ibexa_render_limitation_value(limitation) }} diff --git a/src/bundle/Resources/views/themes/admin/user/role/add.html.twig b/src/bundle/Resources/views/themes/admin/user/role/add.html.twig index d59bf5dee6..92b0f4bfd0 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/add.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set role_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.role_create.sidebar_right') %} diff --git a/src/bundle/Resources/views/themes/admin/user/role/base.html.twig b/src/bundle/Resources/views/themes/admin/user/role/base.html.twig index 31044dd9f1..0cc1ceaede 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% set anchor_params = { close_href: path('ibexa.role.list'), diff --git a/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig b/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig index 808bd92ab0..f2bd0aae3c 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set role_copy_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.role_copy.sidebar_right', [], {'role': role}) %} diff --git a/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig index f3a78386f0..bc725d2f56 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set role_edit_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.role_edit.sidebar_right', [], {'role': role}) %} diff --git a/src/bundle/Resources/views/themes/admin/user/role/index.html.twig b/src/bundle/Resources/views/themes/admin/user/role/index.html.twig index fa8a67f0d0..7a2f9eba8a 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/index.html.twig @@ -1,6 +1,6 @@ {% extends "@ibexadesign/ui/layout.html.twig" %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block body_class %}ibexa-role-view{% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/role/list.html.twig b/src/bundle/Resources/views/themes/admin/user/role/list.html.twig index 28fd2e93d7..b8d504a2eb 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/list.html.twig @@ -2,7 +2,7 @@ {% from '@ibexadesign/ui/component/macros.html.twig' import results_headline %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% form_theme form_roles_delete '@ibexadesign/ui/form_fields.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/base.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/base.html.twig index 9d7174d4c9..524d08a967 100644 --- a/src/bundle/Resources/views/themes/admin/user/role_assignment/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/base.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% set anchor_params = { close_href: path('ibexa.role.list'), diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig index ad9979e737..154f12db52 100644 --- a/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig @@ -2,7 +2,7 @@ {% form_theme form '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %} {% block header_admin %} {% set role_assignment_create_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.role_assignment_create.sidebar_right', [], {'role': role}) %} @@ -36,7 +36,7 @@ "{{user.content.versionInfo.contentInfo.id}}": user.id }), {}) %} {% set users_udw_title = "role_assignment.view.add.panel.users_and_groups.users.udw_title" - |trans({}, "role") + |trans({}, 'ibexa_role') |desc("Select Users to assign to the Role") %} {{ include('@ibexadesign/ui/component/tag_view_select/tag_view_select.html.twig', { @@ -68,7 +68,7 @@ "{{group.content.versionInfo.contentInfo.i}}": group.id }), {}) %} {% set groups_udw_title = "role_assignment.view.add.panel.users_and_groups.groups.udw_title" - |trans({}, "role") + |trans({}, 'ibexa_role') |desc("Select User Groups to assign to the Role") %} {{ include('@ibexadesign/ui/component/tag_view_select/tag_view_select.html.twig', { diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig index ea68aff468..70b60a6914 100644 --- a/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/list.html.twig @@ -1,6 +1,6 @@ {% form_theme form_role_assignments_delete '@ibexadesign/ui/form_fields.html.twig' %} -{% trans_default_domain 'role' %} +{% trans_default_domain 'ibexa_role' %}
    {% set body_rows = [] %} @@ -30,7 +30,7 @@
    • - {{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ezplatform_content_forms_policies')|desc('%identifier%') }}: + {{ ('policy.limitation.identifier.' ~ limitation.identifier|lower)|trans({'%identifier%': limitation.identifier}, 'ibexa_content_forms_policies')|desc('%identifier%') }}: {{ ibexa_render_limitation_value(limitation) }}
    • diff --git a/src/bundle/Templating/Twig/FormatIntervalExtension.php b/src/bundle/Templating/Twig/FormatIntervalExtension.php index 723b05be4d..bf3b4e02eb 100644 --- a/src/bundle/Templating/Twig/FormatIntervalExtension.php +++ b/src/bundle/Templating/Twig/FormatIntervalExtension.php @@ -52,7 +52,7 @@ public function formatInterval(string $periodFormat) /** @ignore */ sprintf('interval.format.%s', $name), ['%count%' => $interval->$part], - 'time_diff' + 'ibexa_time_diff' ); } } @@ -63,12 +63,12 @@ public function formatInterval(string $periodFormat) public static function getTranslationMessages(): array { return [ - (new Message('interval.format.seconds', 'time_diff'))->setDesc('1 second|%count% seconds'), - (new Message('interval.format.minutes', 'time_diff'))->setDesc('1 minute|%count% minutes'), - (new Message('interval.format.hours', 'time_diff'))->setDesc('1 hour|%count% hours'), - (new Message('interval.format.days', 'time_diff'))->setDesc('1 day|%count% days'), - (new Message('interval.format.months', 'time_diff'))->setDesc('1 month|%count% months'), - (new Message('interval.format.years', 'time_diff'))->setDesc('1 year|%count% years'), + (new Message('interval.format.seconds', 'ibexa_time_diff'))->setDesc('1 second|%count% seconds'), + (new Message('interval.format.minutes', 'ibexa_time_diff'))->setDesc('1 minute|%count% minutes'), + (new Message('interval.format.hours', 'ibexa_time_diff'))->setDesc('1 hour|%count% hours'), + (new Message('interval.format.days', 'ibexa_time_diff'))->setDesc('1 day|%count% days'), + (new Message('interval.format.months', 'ibexa_time_diff'))->setDesc('1 month|%count% months'), + (new Message('interval.format.years', 'ibexa_time_diff'))->setDesc('1 year|%count% years'), ]; } } diff --git a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js index 2a2d844cd9..bca0c416dd 100644 --- a/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js +++ b/src/bundle/ui-dev/src/modules/common/dropdown/dropdown.js @@ -61,7 +61,7 @@ const Dropdown = ({ dropdownListRef, value, options, onChange, small, single, ex }; const renderItemsList = () => { const itemsStyles = {}; - const placeholder = Translator.trans(/*@Desc("Search...")*/ 'dropdown.placeholder', {}, 'universal_discovery_widget'); + const placeholder = Translator.trans(/*@Desc("Search...")*/ 'dropdown.placeholder', {}, 'ibexa_universal_discovery_widget'); const itemsContainerClass = createCssClassNames({ 'ibexa-dropdown__items': true, 'ibexa-dropdown__items--search-hidden': options.length < minSearchItems, diff --git a/src/bundle/ui-dev/src/modules/common/input/filter.search.js b/src/bundle/ui-dev/src/modules/common/input/filter.search.js index 04fe51a8ca..54cae92876 100644 --- a/src/bundle/ui-dev/src/modules/common/input/filter.search.js +++ b/src/bundle/ui-dev/src/modules/common/input/filter.search.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { createCssClassNames } from '../../common/helpers/css.class.names'; const { Translator } = window; -const defaultPlaceholder = Translator.trans(/*@Desc("Search...")*/ 'search.placeholder', {}, 'universal_discovery_widget'); +const defaultPlaceholder = Translator.trans(/*@Desc("Search...")*/ 'search.placeholder', {}, 'ibexa_universal_discovery_widget'); const Search = ({ onChange, placeholder, extraClasses, value }) => { const searchClassName = createCssClassNames({ diff --git a/src/bundle/ui-dev/src/modules/common/popup/popup.component.js b/src/bundle/ui-dev/src/modules/common/popup/popup.component.js index 1a15bfba11..f8234288a4 100644 --- a/src/bundle/ui-dev/src/modules/common/popup/popup.component.js +++ b/src/bundle/ui-dev/src/modules/common/popup/popup.component.js @@ -121,7 +121,7 @@ class Popup extends Component { return; } - const closeBtnLabel = Translator.trans(/*@Desc("Close")*/ 'popup.close.label', {}, 'universal_discovery_widget'); + const closeBtnLabel = Translator.trans(/*@Desc("Close")*/ 'popup.close.label', {}, 'ibexa_universal_discovery_widget'); return ( ); }; - const filtersLabel = Translator.trans(/*@Desc("Filters")*/ 'filters.title', {}, 'universal_discovery_widget'); - const languageLabel = Translator.trans(/*@Desc("Language")*/ 'filters.language', {}, 'universal_discovery_widget'); - const sectionLabel = Translator.trans(/*@Desc("Section")*/ 'filters.section', {}, 'universal_discovery_widget'); - const subtreeLabel = Translator.trans(/*@Desc("Subtree")*/ 'filters.subtree', {}, 'universal_discovery_widget'); - const clearLabel = Translator.trans(/*@Desc("Clear")*/ 'filters.clear', {}, 'universal_discovery_widget'); - const applyLabel = Translator.trans(/*@Desc("Apply")*/ 'filters.apply', {}, 'universal_discovery_widget'); + const filtersLabel = Translator.trans(/*@Desc("Filters")*/ 'filters.title', {}, 'ibexa_universal_discovery_widget'); + const languageLabel = Translator.trans(/*@Desc("Language")*/ 'filters.language', {}, 'ibexa_universal_discovery_widget'); + const sectionLabel = Translator.trans(/*@Desc("Section")*/ 'filters.section', {}, 'ibexa_universal_discovery_widget'); + const subtreeLabel = Translator.trans(/*@Desc("Subtree")*/ 'filters.subtree', {}, 'ibexa_universal_discovery_widget'); + const clearLabel = Translator.trans(/*@Desc("Clear")*/ 'filters.clear', {}, 'ibexa_universal_discovery_widget'); + const applyLabel = Translator.trans(/*@Desc("Apply")*/ 'filters.apply', {}, 'ibexa_universal_discovery_widget'); const languageOptions = languages .filter((language) => language.enabled) .map((language) => ({ diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/search/search.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/search/search.js index 2273186c48..6e1d2775c8 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/search/search.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/search/search.js @@ -71,12 +71,12 @@ const Search = ({ itemsPerPage }) => { search_phrase: searchText, total: data.count, }, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const searchResultsSubtitle = Translator.trans( /*@Desc("in %search_language%")*/ 'search.search_results.in_language', { search_language: selectedLanguageName }, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); return ( @@ -107,28 +107,28 @@ const Search = ({ itemsPerPage }) => { const noResultsLabel = Translator.trans( /*@Desc("No results found for %query%")*/ 'search.no_results', { query: searchText }, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const noResultsHints = [ Translator.trans( /*@Desc("Check the spelling of keywords.")*/ 'search.no_results.hint.check_spelling', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ), Translator.trans( /*@Desc("Try more general keywords.")*/ 'search.no_results.hint.more_general', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ), Translator.trans( /*@Desc("Try different keywords.")*/ 'search.no_results.hint.different_kewords', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ), Translator.trans( /*@Desc("Try fewer keywords. Reducing keywords results in more matches.")*/ 'search.no_results.hint.fewer_keywords', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ), ]; diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js index 75402559cd..42c674a898 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.item.js @@ -15,7 +15,7 @@ const SelectedLocationsItem = ({ location, permissions }) => { const clearLabel = Translator.trans( /*@Desc("Clear selection")*/ 'selected_locations.clear_selection', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const removeFromSelection = () => { ibexa.helpers.tooltips.hideAll(refSelectedLocationsItem.current); diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.js index f971c679b2..26b3dc0451 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/selected-locations/selected.locations.js @@ -18,11 +18,15 @@ const SelectedLocations = () => { 'c-selected-locations': true, 'c-selected-locations--expanded': isExpanded, }); - const expandLabel = Translator.trans(/*@Desc("Expand sidebar")*/ 'selected_locations.expand.sidebar', {}, 'universal_discovery_widget'); + const expandLabel = Translator.trans( + /*@Desc("Expand sidebar")*/ 'selected_locations.expand.sidebar', + {}, + 'ibexa_universal_discovery_widget', + ); const collapseLabel = Translator.trans( /*@Desc("Collapse sidebar")*/ 'selected_locations.collapse.sidebar', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const togglerLabel = isExpanded ? collapseLabel : expandLabel; const clearSelection = () => { @@ -36,7 +40,7 @@ const SelectedLocations = () => { const selectedLabel = Translator.trans( /*@Desc("%count% selected item(s)")*/ 'selected_locations.selected_items', { count: selectedLocations.length }, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); return
      {selectedLabel}
      ; @@ -61,7 +65,7 @@ const SelectedLocations = () => { const removeAllLabel = Translator.trans( /*@Desc("Deselect all")*/ 'selected_locations.deselect_all', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); return ( diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.js index a9168dfe92..153ad69752 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/top-menu/top.menu.js @@ -20,7 +20,7 @@ const TopMenu = ({ actionsDisabledMap }) => { return actionB.priority - actionA.priority; }); }, []); - const backTitle = Translator.trans(/*@Desc("Close")*/ 'close.label', {}, 'universal_discovery_widget'); + const backTitle = Translator.trans(/*@Desc("Close")*/ 'close.label', {}, 'ibexa_universal_discovery_widget'); const className = createCssClassNames({ 'c-top-menu': true, 'c-top-menu--search-opened': isSearchOpened, diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/translation-selector/translation.selector.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/translation-selector/translation.selector.js index 169f2806d7..202da88f31 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/translation-selector/translation.selector.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/translation-selector/translation.selector.js @@ -11,7 +11,7 @@ const TranslationSelectorButton = ({ hideTranslationSelector, selectTranslation, const editTranslationLabel = Translator.trans( /*@Desc("Select translation")*/ 'meta_preview.edit_translation', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const className = createCssClassNames({ 'c-translation-selector': true, diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/view-switcher/view.switcher.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/view-switcher/view.switcher.js index c4c7460e30..e2d734b90e 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/view-switcher/view.switcher.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/view-switcher/view.switcher.js @@ -7,7 +7,7 @@ import { CurrentViewContext, VIEWS } from '../../universal.discovery.module'; const { ibexa, Translator } = window; const ViewSwitcher = ({ isDisabled }) => { - const viewLabel = Translator.trans(/*@Desc("View")*/ 'view_switcher.view', {}, 'universal_discovery_widget'); + const viewLabel = Translator.trans(/*@Desc("View")*/ 'view_switcher.view', {}, 'ibexa_universal_discovery_widget'); const [currentView, setCurrentView] = useContext(CurrentViewContext); const selectedOption = VIEWS.find((option) => option.value === currentView); const onOptionClick = ({ value }) => { diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/content.create.tab.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/content.create.tab.module.js index f78accdc29..f298094027 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/content.create.tab.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/content.create.tab.module.js @@ -104,7 +104,7 @@ ibexa.addConfig( { id: 'content-create', component: ContentCreateTabModule, - label: Translator.trans(/*@Desc("Content create")*/ 'content_create.label', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Content create")*/ 'content_create.label', {}, 'ibexa_universal_discovery_widget'), icon: ibexa.helpers.icon.getIconPath('search'), isHiddenOnList: true, }, diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/content.edit.tab.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/content.edit.tab.module.js index 086c74a7ea..c39a690624 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/content.edit.tab.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/content.edit.tab.module.js @@ -105,7 +105,7 @@ ibexa.addConfig( { id: 'content-edit', component: ContentEditTabModule, - label: Translator.trans(/*@Desc("Content edit")*/ 'content_edit.label', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Content edit")*/ 'content_edit.label', {}, 'ibexa_universal_discovery_widget'), isHiddenOnList: true, }, ], diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js index 4c432ba1e8..f01726b444 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js @@ -30,9 +30,13 @@ const ContentMetaPreview = () => { const allowRedirects = useContext(AllowRedirectsContext); const { formatShortDateTime } = ibexa.helpers.timezone; const locationData = useMemo(() => getLocationData(loadedLocationsMap, markedLocationId), [markedLocationId, loadedLocationsMap]); - const lastModifiedLabel = Translator.trans(/*@Desc("Modified")*/ 'meta_preview.last_modified', {}, 'universal_discovery_widget'); - const creationDateLabel = Translator.trans(/*@Desc("Created")*/ 'meta_preview.creation_date', {}, 'universal_discovery_widget'); - const translationsLabel = Translator.trans(/*@Desc("Translations")*/ 'meta_preview.translations', {}, 'universal_discovery_widget'); + const lastModifiedLabel = Translator.trans(/*@Desc("Modified")*/ 'meta_preview.last_modified', {}, 'ibexa_universal_discovery_widget'); + const creationDateLabel = Translator.trans(/*@Desc("Created")*/ 'meta_preview.creation_date', {}, 'ibexa_universal_discovery_widget'); + const translationsLabel = Translator.trans( + /*@Desc("Translations")*/ 'meta_preview.translations', + {}, + 'ibexa_universal_discovery_widget', + ); useEffect(() => { ibexa.helpers.tooltips.parse(refContentMetaPreview.current); @@ -60,17 +64,17 @@ const ContentMetaPreview = () => { ); }; const renderActions = () => { - const previewLabel = Translator.trans(/*@Desc("Preview")*/ 'meta_preview.preview', {}, 'universal_discovery_widget'); - const editLabel = Translator.trans(/*@Desc("Edit")*/ 'meta_preview.edit', {}, 'universal_discovery_widget'); + const previewLabel = Translator.trans(/*@Desc("Preview")*/ 'meta_preview.preview', {}, 'ibexa_universal_discovery_widget'); + const editLabel = Translator.trans(/*@Desc("Edit")*/ 'meta_preview.edit', {}, 'ibexa_universal_discovery_widget'); const bookmarksAddLabel = Translator.trans( /*@Desc("Add to bookmarks")*/ 'meta_preview.bookmarks_add', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const bookmarksRemoveLabel = Translator.trans( /*@Desc("Remove from bookmarks")*/ 'meta_preview.bookrmarks_remove', {}, - 'universal_discovery_widget', + 'ibexa_universal_discovery_widget', ); const previewButton = allowRedirects ? ( diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/search.tab.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/search.tab.module.js index c3f3998c1e..a1684df8bf 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/search.tab.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/search.tab.module.js @@ -40,7 +40,7 @@ ibexa.addConfig( { id: 'search', component: SearchTabModule, - label: Translator.trans(/*@Desc("Search")*/ 'search.label', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Search")*/ 'search.label', {}, 'ibexa_universal_discovery_widget'), icon: ibexa.helpers.icon.getIconPath('search'), isHiddenOnList: true, }, diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js index 69c3c26ea4..6ce7f1c64a 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js @@ -23,13 +23,13 @@ export const SORTING_OPTIONS = [ value: 'date:asc', label: (
      - {Translator.trans(/*@Desc("Date")*/ 'sorting.date.label', {}, 'universal_discovery_widget')} + {Translator.trans(/*@Desc("Date")*/ 'sorting.date.label', {}, 'ibexa_universal_discovery_widget')}
      ), selectedLabel: (
      - {Translator.trans(/*@Desc("Sort by date")*/ 'sorting.date.selected_label', {}, 'universal_discovery_widget')} + {Translator.trans(/*@Desc("Sort by date")*/ 'sorting.date.selected_label', {}, 'ibexa_universal_discovery_widget')}
      ), @@ -40,13 +40,13 @@ export const SORTING_OPTIONS = [ value: 'date:desc', label: (
      - {Translator.trans(/*@Desc("Date")*/ 'sorting.date.label', {}, 'universal_discovery_widget')} + {Translator.trans(/*@Desc("Date")*/ 'sorting.date.label', {}, 'ibexa_universal_discovery_widget')}
      ), selectedLabel: (
      - {Translator.trans(/*@Desc("Sort by date")*/ 'sorting.date.selected_label', {}, 'universal_discovery_widget')} + {Translator.trans(/*@Desc("Sort by date")*/ 'sorting.date.selected_label', {}, 'ibexa_universal_discovery_widget')}
      ), @@ -55,15 +55,23 @@ export const SORTING_OPTIONS = [ }, { value: 'name:asc', - label: Translator.trans(/*@Desc("Name A-Z")*/ 'sorting.name.asc.label', {}, 'universal_discovery_widget'), - selectedLabel: Translator.trans(/*@Desc("Sort by name A-Z")*/ 'sorting.name.asc.selected_label', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Name A-Z")*/ 'sorting.name.asc.label', {}, 'ibexa_universal_discovery_widget'), + selectedLabel: Translator.trans( + /*@Desc("Sort by name A-Z")*/ 'sorting.name.asc.selected_label', + {}, + 'ibexa_universal_discovery_widget', + ), sortClause: 'ContentName', sortOrder: 'ascending', }, { value: 'name:desc', - label: Translator.trans(/*@Desc("Name Z-A")*/ 'sorting.name.desc.label', {}, 'universal_discovery_widget'), - selectedLabel: Translator.trans(/*@Desc("Sort by name Z-A")*/ 'sorting.name.desc.selected_label', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Name Z-A")*/ 'sorting.name.desc.label', {}, 'ibexa_universal_discovery_widget'), + selectedLabel: Translator.trans( + /*@Desc("Sort by name Z-A")*/ 'sorting.name.desc.selected_label', + {}, + 'ibexa_universal_discovery_widget', + ), sortClause: 'ContentName', sortOrder: 'descending', }, @@ -72,17 +80,17 @@ export const VIEWS = [ { value: 'finder', iconName: 'panels', - label: Translator.trans(/*@Desc("Panels view")*/ 'sorting.panels.view', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Panels view")*/ 'sorting.panels.view', {}, 'ibexa_universal_discovery_widget'), }, { value: 'grid', iconName: 'view-grid', - label: Translator.trans(/*@Desc("Grid view")*/ 'sorting.grid.view', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Grid view")*/ 'sorting.grid.view', {}, 'ibexa_universal_discovery_widget'), }, { value: 'tree', iconName: 'content-tree', - label: Translator.trans(/*@Desc("Tree view")*/ 'sorting.tree.view', {}, 'universal_discovery_widget'), + label: Translator.trans(/*@Desc("Tree view")*/ 'sorting.tree.view', {}, 'ibexa_universal_discovery_widget'), }, ]; diff --git a/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php b/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php index e877c04926..a6c287ce3d 100644 --- a/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php +++ b/src/lib/EventListener/UserPasswordChangeRightSidebarListener.php @@ -50,13 +50,13 @@ public function onUserPasswordChangeRightSidebarConfigure(ConfigureMenuEvent $ev 'class' => 'ibexa-btn--trigger', 'data-click' => '#user_password_change_change', ], - 'extras' => ['translation_domain' => 'menu'], + 'extras' => ['translation_domain' => 'ibexa_menu'], ] ); $menu->addChild( self::ITEM__CANCEL, [ - 'extras' => ['translation_domain' => 'menu'], + 'extras' => ['translation_domain' => 'ibexa_menu'], 'route' => 'ibexa.dashboard', ] ); @@ -68,8 +68,8 @@ public function onUserPasswordChangeRightSidebarConfigure(ConfigureMenuEvent $ev public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__UPDATE, 'menu'))->setDesc('Update'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/FieldType/Mapper/AuthorFormMapper.php b/src/lib/FieldType/Mapper/AuthorFormMapper.php index dd8bf93f4d..e8ceb5558d 100644 --- a/src/lib/FieldType/Mapper/AuthorFormMapper.php +++ b/src/lib/FieldType/Mapper/AuthorFormMapper.php @@ -12,6 +12,7 @@ use Ibexa\Contracts\ContentForms\Data\Content\FieldData; use Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface; use Ibexa\Core\FieldType\Author\Type; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -39,7 +40,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field 'required' => true, 'property_path' => 'fieldSettings[defaultAuthor]', 'label' => /** @Desc("Default value") */ 'field_definition.ezauthor.default_author', - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', 'disabled' => $isTranslation, ] ); @@ -71,7 +72,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/BinaryFileFormMapper.php b/src/lib/FieldType/Mapper/BinaryFileFormMapper.php index 9a32924521..8125ce103d 100644 --- a/src/lib/FieldType/Mapper/BinaryFileFormMapper.php +++ b/src/lib/FieldType/Mapper/BinaryFileFormMapper.php @@ -10,6 +10,7 @@ use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\ConfigResolver\MaxUploadSize; use Ibexa\Contracts\Core\Repository\FieldTypeService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormInterface; use Symfony\Component\Validator\Constraints\Range; @@ -32,7 +33,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field 'required' => false, 'property_path' => 'validatorConfiguration[FileSizeValidator][maxFileSize]', 'label' => /** @Desc("Maximum file size (MB)") */ 'field_definition.ezbinaryfile.max_file_size', - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', 'constraints' => [ new Range([ 'min' => 0, diff --git a/src/lib/FieldType/Mapper/CheckboxFormMapper.php b/src/lib/FieldType/Mapper/CheckboxFormMapper.php index aa6dfb6749..31b9cdc7ab 100644 --- a/src/lib/FieldType/Mapper/CheckboxFormMapper.php +++ b/src/lib/FieldType/Mapper/CheckboxFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldType\CheckboxFieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -39,7 +40,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/CountryFormMapper.php b/src/lib/FieldType/Mapper/CountryFormMapper.php index f005baf722..134981b232 100644 --- a/src/lib/FieldType/Mapper/CountryFormMapper.php +++ b/src/lib/FieldType/Mapper/CountryFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldType\CountryFieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -55,7 +56,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/DateFormMapper.php b/src/lib/FieldType/Mapper/DateFormMapper.php index f658abd16d..d3883c0d4b 100644 --- a/src/lib/FieldType/Mapper/DateFormMapper.php +++ b/src/lib/FieldType/Mapper/DateFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\Core\FieldType\Date\Type; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -36,7 +37,7 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field 'required' => true, 'property_path' => 'fieldSettings[defaultType]', 'label' => /** @Desc("Default value") */ 'field_definition.ezdate.default_type', - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', 'disabled' => $isTranslation, ] ); @@ -46,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/DateTimeFormMapper.php b/src/lib/FieldType/Mapper/DateTimeFormMapper.php index e6b0a20e14..fcbcf5b690 100644 --- a/src/lib/FieldType/Mapper/DateTimeFormMapper.php +++ b/src/lib/FieldType/Mapper/DateTimeFormMapper.php @@ -10,6 +10,7 @@ use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\AdminUi\Form\Type\DateTimeIntervalType; use Ibexa\Core\FieldType\DateAndTime\Type; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormInterface; @@ -57,7 +58,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/FloatFormMapper.php b/src/lib/FieldType/Mapper/FloatFormMapper.php index f9b68e1731..182f76ef89 100644 --- a/src/lib/FieldType/Mapper/FloatFormMapper.php +++ b/src/lib/FieldType/Mapper/FloatFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldType\FloatFieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -61,7 +62,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/ISBNFormMapper.php b/src/lib/FieldType/Mapper/ISBNFormMapper.php index b4ba6369cb..04eed13130 100644 --- a/src/lib/FieldType/Mapper/ISBNFormMapper.php +++ b/src/lib/FieldType/Mapper/ISBNFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldType\ISBNFieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -51,7 +52,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/ImageFormMapper.php b/src/lib/FieldType/Mapper/ImageFormMapper.php index 6e4ffe13df..bb6df64d18 100644 --- a/src/lib/FieldType/Mapper/ImageFormMapper.php +++ b/src/lib/FieldType/Mapper/ImageFormMapper.php @@ -10,6 +10,7 @@ use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\ConfigResolver\MaxUploadSize; use Ibexa\Contracts\Core\Repository\FieldTypeService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormInterface; @@ -63,7 +64,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/IntegerFormMapper.php b/src/lib/FieldType/Mapper/IntegerFormMapper.php index b78576eb4b..abca291c52 100644 --- a/src/lib/FieldType/Mapper/IntegerFormMapper.php +++ b/src/lib/FieldType/Mapper/IntegerFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldType\IntegerFieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -60,7 +61,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/MediaFormMapper.php b/src/lib/FieldType/Mapper/MediaFormMapper.php index a2ddbb7abf..fe5350c376 100644 --- a/src/lib/FieldType/Mapper/MediaFormMapper.php +++ b/src/lib/FieldType/Mapper/MediaFormMapper.php @@ -11,6 +11,7 @@ use Ibexa\ContentForms\ConfigResolver\MaxUploadSize; use Ibexa\Contracts\Core\Repository\FieldTypeService; use Ibexa\Core\FieldType\Media\Type; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormInterface; @@ -81,7 +82,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/RelationFormMapper.php b/src/lib/FieldType/Mapper/RelationFormMapper.php index 8cd9f28999..57158e9e83 100644 --- a/src/lib/FieldType/Mapper/RelationFormMapper.php +++ b/src/lib/FieldType/Mapper/RelationFormMapper.php @@ -8,6 +8,7 @@ use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\RelationType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormInterface; @@ -47,7 +48,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/RelationListFormMapper.php b/src/lib/FieldType/Mapper/RelationListFormMapper.php index 0208219742..068ff45b8b 100644 --- a/src/lib/FieldType/Mapper/RelationListFormMapper.php +++ b/src/lib/FieldType/Mapper/RelationListFormMapper.php @@ -8,6 +8,7 @@ use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\RelationType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; @@ -56,7 +57,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/SelectionFormMapper.php b/src/lib/FieldType/Mapper/SelectionFormMapper.php index a7ea0bd0b6..e5ced75cce 100644 --- a/src/lib/FieldType/Mapper/SelectionFormMapper.php +++ b/src/lib/FieldType/Mapper/SelectionFormMapper.php @@ -10,6 +10,7 @@ use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\AdminUi\Form\DataTransformer\MultilingualSelectionTransformer; use Ibexa\AdminUi\Form\EventListener\SelectionMultilingualOptionsDataListener; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -91,7 +92,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/TextBlockFormMapper.php b/src/lib/FieldType/Mapper/TextBlockFormMapper.php index 3c167003d9..4d166489eb 100644 --- a/src/lib/FieldType/Mapper/TextBlockFormMapper.php +++ b/src/lib/FieldType/Mapper/TextBlockFormMapper.php @@ -8,6 +8,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -37,7 +38,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/TextLineFormMapper.php b/src/lib/FieldType/Mapper/TextLineFormMapper.php index 451a06c088..604ea8995a 100644 --- a/src/lib/FieldType/Mapper/TextLineFormMapper.php +++ b/src/lib/FieldType/Mapper/TextLineFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldType\TextLineFieldType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -53,7 +54,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/TimeFormMapper.php b/src/lib/FieldType/Mapper/TimeFormMapper.php index 25efc98c65..5df926e511 100644 --- a/src/lib/FieldType/Mapper/TimeFormMapper.php +++ b/src/lib/FieldType/Mapper/TimeFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\Core\FieldType\Time\Type; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormInterface; @@ -56,7 +57,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/FieldType/Mapper/UserAccountFormMapper.php b/src/lib/FieldType/Mapper/UserAccountFormMapper.php index 3abbe31cd1..854aaf3220 100644 --- a/src/lib/FieldType/Mapper/UserAccountFormMapper.php +++ b/src/lib/FieldType/Mapper/UserAccountFormMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface; use Ibexa\AdminUi\Form\Data\FieldDefinitionData; use Ibexa\ContentForms\Form\Type\FieldDefinition\User\PasswordConstraintCheckboxType; +use JMS\TranslationBundle\Annotation\Desc; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; @@ -116,14 +117,14 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } public static function getTranslationMessages(): array { return [ - Message::create('field_definition.ezuser.require_not_compromised_password_help', 'content_type') + Message::create('field_definition.ezuser.require_not_compromised_password_help', 'ibexa_content_type') ->setDesc('This uses the API at %link% to securely check breach data. The password is not transmitted to the API.'), ]; } diff --git a/src/lib/Form/Data/Role/RoleAssignmentCreateData.php b/src/lib/Form/Data/Role/RoleAssignmentCreateData.php index 211178d7c4..4e9977af77 100644 --- a/src/lib/Form/Data/Role/RoleAssignmentCreateData.php +++ b/src/lib/Form/Data/Role/RoleAssignmentCreateData.php @@ -192,7 +192,7 @@ public function validate(ExecutionContextInterface $context, $payload) $context->buildViolation( 'validator.assign_users_or_groups' ) - ->setTranslationDomain('role') + ->setTranslationDomain('ibexa_role') ->addViolation(); } } @@ -200,7 +200,7 @@ public function validate(ExecutionContextInterface $context, $payload) public static function getTranslationMessages() { return [ - Message::create('validator.assign_users_or_groups', 'role') + Message::create('validator.assign_users_or_groups', 'ibexa_role') ->setDesc('Assign User(s) and/or Group(s) to the Role'), Message::create('validator.define_subtree_or_section_limitation', 'validators') ->setDesc('Define a Subtree or Section limitation'), diff --git a/src/lib/Form/Processor/ContentEditNotificationFormProcessor.php b/src/lib/Form/Processor/ContentEditNotificationFormProcessor.php index 60ff3b9842..e82d167f87 100644 --- a/src/lib/Form/Processor/ContentEditNotificationFormProcessor.php +++ b/src/lib/Form/Processor/ContentEditNotificationFormProcessor.php @@ -12,6 +12,7 @@ use Ibexa\ContentForms\Event\ContentFormEvents; use Ibexa\ContentForms\Event\FormActionEvent; use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; @@ -67,7 +68,7 @@ public function addPublishMessage(FormActionEvent $event) /** @Desc("Content published.") */ 'content.published.success', [], - 'content_edit' + 'ibexa_content_edit' ); } @@ -85,7 +86,7 @@ public function addSaveDraftMessage(FormActionEvent $event) /** @Desc("Content draft saved.") */ 'content.draft_saved.success', [], - 'content_edit' + 'ibexa_content_edit' ); } diff --git a/src/lib/Form/Processor/PreviewFormProcessor.php b/src/lib/Form/Processor/PreviewFormProcessor.php index 0b3eef9583..bf42f3bc35 100644 --- a/src/lib/Form/Processor/PreviewFormProcessor.php +++ b/src/lib/Form/Processor/PreviewFormProcessor.php @@ -18,6 +18,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct; use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -94,7 +95,7 @@ public function processPreview(FormActionEvent $event): void /** @Desc("Cannot save content draft.") */ 'error.preview', [], - 'content_preview' + 'ibexa_content_preview' ); $url = $this->getContentEditUrl($data, $languageCode); } diff --git a/src/lib/Form/Type/ChoiceList/Loader/DatePeriodChoiceLoader.php b/src/lib/Form/Type/ChoiceList/Loader/DatePeriodChoiceLoader.php index e4137d71a0..b380c2bee7 100644 --- a/src/lib/Form/Type/ChoiceList/Loader/DatePeriodChoiceLoader.php +++ b/src/lib/Form/Type/ChoiceList/Loader/DatePeriodChoiceLoader.php @@ -8,6 +8,7 @@ namespace Ibexa\AdminUi\Form\Type\ChoiceList\Loader; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Contracts\Translation\TranslatorInterface; class DatePeriodChoiceLoader extends BaseChoiceLoader @@ -39,22 +40,22 @@ private function getDatePeriods(): array $this->translator->trans(/** @Desc("Last week") */ 'date_period_choice.last_week', [], - 'date_period' + 'ibexa_date_period' ) => 'P0Y0M7D', $this->translator->trans(/** @Desc("Last month") */ 'date_period_choice.last_month', [], - 'date_period' + 'ibexa_date_period' ) => 'P0Y1M0D', $this->translator->trans(/** @Desc("Last year") */ 'date_period_choice.last_year', [], - 'date_period' + 'ibexa_date_period' ) => 'P1Y0M0D', $this->translator->trans(/** @Desc("Custom range") */ 'date_period_choice.custom_range', [], - 'date_period' + 'ibexa_date_period' ) => 'custom_range', ]; } diff --git a/src/lib/Form/Type/ContentType/ContentTypeCreateType.php b/src/lib/Form/Type/ContentType/ContentTypeCreateType.php index c9b4cf5229..a0a4001099 100644 --- a/src/lib/Form/Type/ContentType/ContentTypeCreateType.php +++ b/src/lib/Form/Type/ContentType/ContentTypeCreateType.php @@ -8,6 +8,7 @@ use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -42,7 +43,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } diff --git a/src/lib/Form/Type/ContentType/ContentTypeDeleteType.php b/src/lib/Form/Type/ContentType/ContentTypeDeleteType.php index 7567ca779d..c7a8f2c96f 100644 --- a/src/lib/Form/Type/ContentType/ContentTypeDeleteType.php +++ b/src/lib/Form/Type/ContentType/ContentTypeDeleteType.php @@ -6,6 +6,7 @@ */ namespace Ibexa\AdminUi\Form\Type\ContentType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -28,7 +29,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } diff --git a/src/lib/Form/Type/ContentType/ContentTypeGroupDeleteType.php b/src/lib/Form/Type/ContentType/ContentTypeGroupDeleteType.php index 07aa2ca945..e4a36ec60c 100644 --- a/src/lib/Form/Type/ContentType/ContentTypeGroupDeleteType.php +++ b/src/lib/Form/Type/ContentType/ContentTypeGroupDeleteType.php @@ -6,6 +6,7 @@ */ namespace Ibexa\AdminUi\Form\Type\ContentType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -33,7 +34,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(['translation_domain' => 'content_type']); + $resolver->setDefaults(['translation_domain' => 'ibexa_content_type']); } } diff --git a/src/lib/Form/Type/ContentType/ContentTypeGroupType.php b/src/lib/Form/Type/ContentType/ContentTypeGroupType.php index 84e0ff2223..5cb63ee118 100644 --- a/src/lib/Form/Type/ContentType/ContentTypeGroupType.php +++ b/src/lib/Form/Type/ContentType/ContentTypeGroupType.php @@ -6,6 +6,7 @@ */ namespace Ibexa\AdminUi\Form\Type\ContentType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -35,7 +36,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => '\\Ibexa\\Contracts\\Core\\Repository\\Values\\ContentType\\ContentTypeGroupStruct', - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/Form/Type/ContentType/ContentTypeUpdateType.php b/src/lib/Form/Type/ContentType/ContentTypeUpdateType.php index c12af12b67..dfc26f880e 100644 --- a/src/lib/Form/Type/ContentType/ContentTypeUpdateType.php +++ b/src/lib/Form/Type/ContentType/ContentTypeUpdateType.php @@ -8,6 +8,7 @@ use Ibexa\AdminUi\Form\Data\ContentTypeData; use Ibexa\AdminUi\Form\DataTransformer\TranslatablePropertyTransformer; +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\SubmitType; @@ -35,7 +36,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver ->setDefaults([ 'data_class' => ContentTypeData::class, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', 'mainLanguageCode' => null, ]) ->setDefined(['mainLanguageCode']) diff --git a/src/lib/Form/Type/ContentType/FieldDefinitionsCollectionType.php b/src/lib/Form/Type/ContentType/FieldDefinitionsCollectionType.php index 0d30ab7b81..b0f5b501b2 100644 --- a/src/lib/Form/Type/ContentType/FieldDefinitionsCollectionType.php +++ b/src/lib/Form/Type/ContentType/FieldDefinitionsCollectionType.php @@ -10,6 +10,7 @@ use Ibexa\AdminUi\Form\Type\FieldDefinition\FieldDefinitionType; use Ibexa\Core\Helper\FieldsGroups\FieldsGroupsList; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\FormBuilderInterface; @@ -53,7 +54,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver ->setDefaults([ - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', 'mainLanguageCode' => null, ]) ->setDefined(['mainLanguageCode']) diff --git a/src/lib/Form/Type/ContentType/FieldTypeChoiceType.php b/src/lib/Form/Type/ContentType/FieldTypeChoiceType.php index 378842d55e..1ef61932ae 100644 --- a/src/lib/Form/Type/ContentType/FieldTypeChoiceType.php +++ b/src/lib/Form/Type/ContentType/FieldTypeChoiceType.php @@ -7,6 +7,7 @@ namespace Ibexa\AdminUi\Form\Type\ContentType; use Ibexa\Core\FieldType\FieldTypeRegistry; +use JMS\TranslationBundle\Annotation\Ignore; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -84,7 +85,7 @@ private function getFieldTypeLabel($fieldTypeIdentifier) return $this->translator->trans(/** @Ignore */ $fieldTypeIdentifier . '.name', [], - 'fieldtypes' + 'ibexa_fieldtypes' ); } } diff --git a/src/lib/Form/Type/ContentType/SortFieldChoiceType.php b/src/lib/Form/Type/ContentType/SortFieldChoiceType.php index b2da67fa7c..3f0a9edf78 100644 --- a/src/lib/Form/Type/ContentType/SortFieldChoiceType.php +++ b/src/lib/Form/Type/ContentType/SortFieldChoiceType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ContentType; use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -31,7 +32,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'choices' => $this->getSortFieldChoices(), - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } @@ -68,47 +69,47 @@ private function getSortField(): array $this->translator->trans(/** @Desc("Content name") */ 'content_type.sort_field.name', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_NAME, $this->translator->trans(/** @Desc("Location priority") */ 'content_type.sort_field.priority', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_PRIORITY, $this->translator->trans(/** @Desc("Modification date") */ 'content_type.sort_field.modified', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_MODIFIED, $this->translator->trans(/** @Desc("Publication date") */ 'content_type.sort_field.published', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_PUBLISHED, $this->translator->trans(/** @Desc("Location path") */ 'content_type.sort_field.location_path', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_PATH, $this->translator->trans(/** @Desc("Section identifier") */ 'content_type.sort_field.section_identifier', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_SECTION, $this->translator->trans(/** @Desc("Location depth") */ 'content_type.sort_field.depth', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_DEPTH, $this->translator->trans(/** @Desc("Location ID") */ 'content_type.sort_field.location_id', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_NODE_ID, $this->translator->trans(/** @Desc("Content ID") */ 'content_type.sort_field.content_id', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_FIELD_CONTENTOBJECT_ID, ]; } diff --git a/src/lib/Form/Type/ContentType/SortOrderChoiceType.php b/src/lib/Form/Type/ContentType/SortOrderChoiceType.php index 9ac2417f13..d020274a76 100644 --- a/src/lib/Form/Type/ContentType/SortOrderChoiceType.php +++ b/src/lib/Form/Type/ContentType/SortOrderChoiceType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ContentType; use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -33,7 +34,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'choices' => $this->getSortOrderChoices(), - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } @@ -68,12 +69,12 @@ private function getSortOrder() $this->translator->trans(/** @Desc("Ascending") */ 'content_type.sort_field.ascending', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_ORDER_ASC, $this->translator->trans(/** @Desc("Descending") */ 'content_type.sort_field.descending', [], - 'content_type' + 'ibexa_content_type' ) => Location::SORT_ORDER_DESC, ]; } diff --git a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php index 3be1db3694..8b5f90378f 100644 --- a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php +++ b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupCreateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ContentTypeGroup; use Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupCreateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -38,7 +39,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ContentTypeGroupCreateData::class, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupDeleteType.php b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupDeleteType.php index d0c78d1eaf..46bbdd09c7 100644 --- a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupDeleteType.php +++ b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupDeleteType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ContentTypeGroup; use Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupDeleteData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -35,7 +36,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ContentTypeGroupDeleteData::class, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php index d85908aa2d..14af26c4b0 100644 --- a/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php +++ b/src/lib/Form/Type/ContentTypeGroup/ContentTypeGroupUpdateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ContentTypeGroup; use Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupUpdateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -38,7 +39,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ContentTypeGroupUpdateData::class, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/Form/Type/Extension/Content/ContentEditTypeExtension.php b/src/lib/Form/Type/Extension/Content/ContentEditTypeExtension.php index 7d400a2cc8..d41c91fca7 100644 --- a/src/lib/Form/Type/Extension/Content/ContentEditTypeExtension.php +++ b/src/lib/Form/Type/Extension/Content/ContentEditTypeExtension.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\Extension\Content; use Ibexa\ContentForms\Form\Type\Content\ContentEditType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractTypeExtension; use Symfony\Component\Form\Event\PostSubmitEvent; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -32,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'hidden' => true, 'formnovalidate' => 'formnovalidate', ], - 'translation_domain' => 'content_preview', + 'translation_domain' => 'ibexa_content_preview', ]); $builder->addEventListener(FormEvents::POST_SUBMIT, static function (PostSubmitEvent $event): void { diff --git a/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php b/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php index fbc2c382d4..4a83bed8b6 100644 --- a/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php +++ b/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\Core\Repository\FieldTypeService; use Ibexa\Contracts\Core\Repository\Strategy\ContentThumbnail\Field\ThumbnailStrategy; use Ibexa\Core\Helper\FieldsGroups\FieldsGroupsList; +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\HiddenType; @@ -66,7 +67,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver ->setDefaults([ 'data_class' => FieldDefinitionData::class, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', 'mainLanguageCode' => null, 'disable_identifier_field' => false, 'disable_required_field' => false, diff --git a/src/lib/Form/Type/FieldDefinition/User/PasswordConstraintCheckboxType.php b/src/lib/Form/Type/FieldDefinition/User/PasswordConstraintCheckboxType.php index f2de867a81..e4f09d83ee 100644 --- a/src/lib/Form/Type/FieldDefinition/User/PasswordConstraintCheckboxType.php +++ b/src/lib/Form/Type/FieldDefinition/User/PasswordConstraintCheckboxType.php @@ -41,7 +41,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'required' => false, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } diff --git a/src/lib/Form/Type/Location/LocationUpdateType.php b/src/lib/Form/Type/Location/LocationUpdateType.php index c80e126791..c5c1ef53c4 100644 --- a/src/lib/Form/Type/Location/LocationUpdateType.php +++ b/src/lib/Form/Type/Location/LocationUpdateType.php @@ -12,6 +12,7 @@ use Ibexa\AdminUi\Form\Type\Content\LocationType; use Ibexa\AdminUi\Form\Type\ContentType\SortFieldChoiceType; use Ibexa\AdminUi\Form\Type\ContentType\SortOrderChoiceType; +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) { $resolver->setDefaults([ 'data_class' => LocationUpdateData::class, - 'translation_domain' => 'content_type', + 'translation_domain' => 'ibexa_content_type', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ContentObjectStateUpdateType.php b/src/lib/Form/Type/ObjectState/ContentObjectStateUpdateType.php index b23063b574..c34ca626db 100644 --- a/src/lib/Form/Type/ObjectState/ContentObjectStateUpdateType.php +++ b/src/lib/Form/Type/ObjectState/ContentObjectStateUpdateType.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\Core\Repository\ObjectStateService; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -85,7 +86,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ContentObjectStateUpdateData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php b/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php index ccf014bfe4..349af42751 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateCreateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateCreateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -41,7 +42,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateCreateData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateDeleteType.php b/src/lib/Form/Type/ObjectState/ObjectStateDeleteType.php index 5c92ebed5c..2b5da88aa8 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateDeleteType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateDeleteType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateDeleteData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -36,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateDeleteData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php b/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php index 4fe5eeac87..acdbe7b569 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateGroupCreateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateGroupCreateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -41,7 +42,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateGroupCreateData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateGroupDeleteType.php b/src/lib/Form/Type/ObjectState/ObjectStateGroupDeleteType.php index 3f22572b67..8249d4a8df 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateGroupDeleteType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateGroupDeleteType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateGroupDeleteData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -36,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateGroupDeleteData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php b/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php index e6b8bd294b..010d8dc892 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateGroupUpdateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateGroupUpdateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -41,7 +42,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateGroupUpdateData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateGroupsDeleteType.php b/src/lib/Form/Type/ObjectState/ObjectStateGroupsDeleteType.php index 7688a6f1bc..0347110320 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateGroupsDeleteType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateGroupsDeleteType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateGroupsDeleteData; +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\CollectionType; @@ -38,7 +39,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateGroupsDeleteData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php b/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php index 94ab98204a..efd3f1f40c 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStateUpdateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStateUpdateData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -41,7 +42,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStateUpdateData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/ObjectState/ObjectStatesDeleteType.php b/src/lib/Form/Type/ObjectState/ObjectStatesDeleteType.php index 65d19b4168..8817868cf9 100644 --- a/src/lib/Form/Type/ObjectState/ObjectStatesDeleteType.php +++ b/src/lib/Form/Type/ObjectState/ObjectStatesDeleteType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ObjectState; use Ibexa\AdminUi\Form\Data\ObjectState\ObjectStatesDeleteData; +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\CollectionType; @@ -38,7 +39,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => ObjectStatesDeleteData::class, - 'translation_domain' => 'object_state', + 'translation_domain' => 'ibexa_object_state', ]); } } diff --git a/src/lib/Form/Type/Policy/PolicyCreateWithLimitationType.php b/src/lib/Form/Type/Policy/PolicyCreateWithLimitationType.php index acdac54651..f7bb417b8d 100644 --- a/src/lib/Form/Type/Policy/PolicyCreateWithLimitationType.php +++ b/src/lib/Form/Type/Policy/PolicyCreateWithLimitationType.php @@ -11,6 +11,7 @@ use Ibexa\AdminUi\Form\Data\Policy\PolicyCreateData; use Ibexa\AdminUi\Form\Type\Role\LimitationType; use Ibexa\Contracts\Core\Repository\RoleService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -65,7 +66,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $form->add('limitations', CollectionType::class, [ 'label' => false, - 'translation_domain' => 'ezplatform_content_forms_role', + 'translation_domain' => 'ibexa_content_forms_role', 'entry_type' => LimitationType::class, 'data' => $this->generateLimitationList( $data->getLimitations(), @@ -82,7 +83,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_role', + 'translation_domain' => 'ibexa_content_forms_role', 'data_class' => PolicyCreateData::class, ]); } diff --git a/src/lib/Form/Type/Policy/PolicyDeleteType.php b/src/lib/Form/Type/Policy/PolicyDeleteType.php index dd7eb6220f..532b95d02a 100644 --- a/src/lib/Form/Type/Policy/PolicyDeleteType.php +++ b/src/lib/Form/Type/Policy/PolicyDeleteType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\Policy; use Ibexa\AdminUi\Form\Data\Policy\PolicyDeleteData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormBuilderInterface; @@ -40,7 +41,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_role', + 'translation_domain' => 'ibexa_content_forms_role', 'data_class' => PolicyDeleteData::class, ]); } diff --git a/src/lib/Form/Type/Policy/PolicyUpdateType.php b/src/lib/Form/Type/Policy/PolicyUpdateType.php index 70159c2129..4c8d66fe4c 100644 --- a/src/lib/Form/Type/Policy/PolicyUpdateType.php +++ b/src/lib/Form/Type/Policy/PolicyUpdateType.php @@ -11,6 +11,7 @@ use Ibexa\AdminUi\Form\Data\Policy\PolicyUpdateData; use Ibexa\AdminUi\Form\Type\Role\LimitationType; use Ibexa\Contracts\Core\Repository\RoleService; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -67,7 +68,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $form->add('limitations', CollectionType::class, [ 'label' => false, - 'translation_domain' => 'ezplatform_content_forms_role', + 'translation_domain' => 'ibexa_content_forms_role', 'entry_type' => LimitationType::class, 'data' => $this->generateLimitationList( $data->getLimitations(), @@ -84,7 +85,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'translation_domain' => 'ezplatform_content_forms_role', + 'translation_domain' => 'ibexa_content_forms_role', 'data_class' => PolicyUpdateData::class, ]); } diff --git a/src/lib/Form/Type/Role/LimitationType.php b/src/lib/Form/Type/Role/LimitationType.php index 7bfc5c87ae..716001a5f1 100644 --- a/src/lib/Form/Type/Role/LimitationType.php +++ b/src/lib/Form/Type/Role/LimitationType.php @@ -76,7 +76,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => '\\Ibexa\\Contracts\\Core\\Repository\\Values\\User\\Limitation', - 'translation_domain' => 'ezplatform_content_forms_policies', + 'translation_domain' => 'ibexa_content_forms_policies', ]); } diff --git a/src/lib/Form/Type/Search/SearchType.php b/src/lib/Form/Type/Search/SearchType.php index a64cd8d48a..94bf03511e 100644 --- a/src/lib/Form/Type/Search/SearchType.php +++ b/src/lib/Form/Type/Search/SearchType.php @@ -8,6 +8,7 @@ use Ibexa\AdminUi\Form\Type\Date\DateIntervalType; use Ibexa\AdminUi\Form\Type\User\UserType; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; @@ -74,7 +75,7 @@ public function configureOptions(OptionsResolver $resolver) 'created' => 'created_select', 'last_modified' => 'last_modified_select', ], - 'translation_domain' => 'search', + 'translation_domain' => 'ibexa_search', ]); } @@ -104,22 +105,22 @@ private function getTimePeriodField(): array $this->translator->trans(/** @Desc("Last week") */ 'search.last_week', [], - 'search' + 'ibexa_search' ) => 'P0Y0M7D', $this->translator->trans(/** @Desc("Last month") */ 'search.last_month', [], - 'search' + 'ibexa_search' ) => 'P0Y1M0D', $this->translator->trans(/** @Desc("Last year") */ 'search.last_year', [], - 'search' + 'ibexa_search' ) => 'P1Y0M0D', $this->translator->trans(/** @Desc("Custom range") */ 'search.custom_range', [], - 'search' + 'ibexa_search' ) => 'custom_range', ]; } diff --git a/src/lib/Form/Type/Search/TrashSearchType.php b/src/lib/Form/Type/Search/TrashSearchType.php index ebfbd4df50..7000954bac 100644 --- a/src/lib/Form/Type/Search/TrashSearchType.php +++ b/src/lib/Form/Type/Search/TrashSearchType.php @@ -15,6 +15,7 @@ use Ibexa\AdminUi\Form\Type\Trash\ChoiceList\Loader\SearchContentTypeChoiceLoader; use Ibexa\AdminUi\Form\Type\User\UserType; use Ibexa\Contracts\Core\Repository\PermissionResolver; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; @@ -98,7 +99,7 @@ public function configureOptions(OptionsResolver $resolver) 'data_class' => TrashSearchData::class, 'method' => Request::METHOD_GET, 'csrf_protection' => false, - 'translation_domain' => 'trash', + 'translation_domain' => 'ibexa_trash', ]); } } diff --git a/src/lib/Form/Type/URL/URLEditType.php b/src/lib/Form/Type/URL/URLEditType.php index a6d585f194..f8b524229c 100644 --- a/src/lib/Form/Type/URL/URLEditType.php +++ b/src/lib/Form/Type/URL/URLEditType.php @@ -32,7 +32,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => URLUpdateData::class, - 'translation_domain' => 'ezplatform_content_forms_url', + 'translation_domain' => 'ibexa_content_forms_url', ]); } diff --git a/src/lib/Form/Type/URL/URLListType.php b/src/lib/Form/Type/URL/URLListType.php index 52dd0f9199..878ed0e9d7 100644 --- a/src/lib/Form/Type/URL/URLListType.php +++ b/src/lib/Form/Type/URL/URLListType.php @@ -7,6 +7,7 @@ namespace Ibexa\AdminUi\Form\Type\URL; use Ibexa\AdminUi\Form\Data\URL\URLListData; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; @@ -46,19 +47,19 @@ public function buildForm(FormBuilderInterface $builder, array $options) /** @Desc("Invalid") */ 'url.status.invalid', [], - 'ezplatform_content_forms_url' + 'ibexa_content_forms_url' ) => false, $this->translator->trans( /** @Desc("Valid") */ 'url.status.valid', [], - 'ezplatform_content_forms_url' + 'ibexa_content_forms_url' ) => true, ], 'placeholder' => $this->translator->trans(/** @Desc("All") */ 'url.status.all', [], - 'ezplatform_content_forms_url' + 'ibexa_content_forms_url' ), 'required' => false, ]); @@ -78,7 +79,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ 'data_class' => URLListData::class, - 'translation_domain' => 'ezplatform_content_forms_url', + 'translation_domain' => 'ibexa_content_forms_url', ]); } diff --git a/src/lib/Form/Type/URLWildcard/URLWildcardDeleteType.php b/src/lib/Form/Type/URLWildcard/URLWildcardDeleteType.php index b7f966263b..325d7e9ed2 100644 --- a/src/lib/Form/Type/URLWildcard/URLWildcardDeleteType.php +++ b/src/lib/Form/Type/URLWildcard/URLWildcardDeleteType.php @@ -43,7 +43,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => URLWildcardDeleteData::class, - 'translation_domain' => 'url_wildcard', + 'translation_domain' => 'ibexa_url_wildcard', ]); } } diff --git a/src/lib/Form/Type/URLWildcard/URLWildcardListType.php b/src/lib/Form/Type/URLWildcard/URLWildcardListType.php index ee13c34cfb..a659374d66 100644 --- a/src/lib/Form/Type/URLWildcard/URLWildcardListType.php +++ b/src/lib/Form/Type/URLWildcard/URLWildcardListType.php @@ -46,7 +46,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => URLWildcardListData::class, - 'translation_domain' => 'ezplatform_url_wildcard', + 'translation_domain' => 'ibexa_url_wildcard', ]); } @@ -56,9 +56,9 @@ public function configureOptions(OptionsResolver $resolver): void public static function getTranslationMessages(): array { return [ - (new Message(self::TYPE_DIRECT, 'ezplatform_url_wildcard'))->setDesc('Direct'), - (new Message(self::TYPE_FORWARD, 'ezplatform_url_wildcard'))->setDesc('Forward'), - (new Message(self::PLACEHOLDER, 'ezplatform_url_wildcard'))->setDesc('All'), + (new Message(self::TYPE_DIRECT, 'ibexa_url_wildcard'))->setDesc('Direct'), + (new Message(self::TYPE_FORWARD, 'ibexa_url_wildcard'))->setDesc('Forward'), + (new Message(self::PLACEHOLDER, 'ibexa_url_wildcard'))->setDesc('All'), ]; } } diff --git a/src/lib/Form/Type/URLWildcard/URLWildcardType.php b/src/lib/Form/Type/URLWildcard/URLWildcardType.php index db53e0f1ec..528f334e3f 100644 --- a/src/lib/Form/Type/URLWildcard/URLWildcardType.php +++ b/src/lib/Form/Type/URLWildcard/URLWildcardType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\URLWildcard; use Ibexa\AdminUi\Form\Data\URLWildcard\URLWildcardData; +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\SubmitType; @@ -46,7 +47,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => URLWildcardData::class, - 'translation_domain' => 'url_wildcard', + 'translation_domain' => 'ibexa_url_wildcard', ]); } } diff --git a/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php b/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php index ad25f6257f..1519961bf5 100644 --- a/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php +++ b/src/lib/Form/Type/URLWildcard/URLWildcardUpdateType.php @@ -9,6 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\URLWildcard; use Ibexa\AdminUi\Form\Data\URLWildcard\URLWildcardUpdateData; +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\TextType; @@ -42,7 +43,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'data_class' => URLWildcardUpdateData::class, - 'translation_domain' => 'url_wildcard', + 'translation_domain' => 'ibexa_url_wildcard', ]); } } diff --git a/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php b/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php index cb8aca96a6..4c11edab0d 100644 --- a/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php @@ -13,6 +13,7 @@ use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ChangeOwnerLimitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Annotation\Desc; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -89,7 +90,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('changeowner'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Change Owner'), ]; } diff --git a/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php b/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php index f8ce3f1a54..aad45262c9 100644 --- a/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php @@ -62,15 +62,15 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('class'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Content Type'), Message::create( LimitationIdentifierToLabelConverter::convert('parentclass'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Content Type of Parent'), Message::create( LimitationIdentifierToLabelConverter::convert('parentgroup'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Content Type Group of Parent'), ]; } diff --git a/src/lib/Limitation/Mapper/GroupLimitationMapper.php b/src/lib/Limitation/Mapper/GroupLimitationMapper.php index 594465aea0..4a8aeaac1f 100644 --- a/src/lib/Limitation/Mapper/GroupLimitationMapper.php +++ b/src/lib/Limitation/Mapper/GroupLimitationMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Annotation\Desc; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -31,7 +32,7 @@ protected function getSelectionChoices() 1 => $this->translator->trans(/** @Desc("Self") */ 'policy.limitation.group.self', [], - 'ezplatform_content_forms_role' + 'ibexa_content_forms_role' ), ]; } @@ -42,7 +43,7 @@ public function mapLimitationValue(Limitation $limitation) $this->translator->trans(/** @Desc("Self") */ 'policy.limitation.group.self', [], - 'ezplatform_content_forms_role' + 'ibexa_content_forms_role' ), ]; } @@ -52,7 +53,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('group'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Content Type Group'), ]; } diff --git a/src/lib/Limitation/Mapper/LanguageLimitationMapper.php b/src/lib/Limitation/Mapper/LanguageLimitationMapper.php index 68afa46540..f01171b9a7 100644 --- a/src/lib/Limitation/Mapper/LanguageLimitationMapper.php +++ b/src/lib/Limitation/Mapper/LanguageLimitationMapper.php @@ -61,7 +61,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('language'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Language'), ]; } diff --git a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php index 693631cba8..875aa8f66d 100644 --- a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php +++ b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php @@ -18,6 +18,7 @@ use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; use Ibexa\Core\Limitation\MemberOfLimitationType; +use JMS\TranslationBundle\Annotation\Desc; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -97,7 +98,7 @@ private function getSelfUserGroupLabel(): string /** @Desc("Self") */ 'policy.limitation.member_of.self_user_group', [], - 'ezplatform_content_forms_role' + 'ibexa_content_forms_role' ); } @@ -106,7 +107,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('memberof'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('MemberOf'), ]; } diff --git a/src/lib/Limitation/Mapper/NullLimitationMapper.php b/src/lib/Limitation/Mapper/NullLimitationMapper.php index 3f7c3355fb..19ee722831 100644 --- a/src/lib/Limitation/Mapper/NullLimitationMapper.php +++ b/src/lib/Limitation/Mapper/NullLimitationMapper.php @@ -49,7 +49,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('status'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Status'), ]; } diff --git a/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php b/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php index 4559ecf526..fd71c02b27 100644 --- a/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php @@ -77,11 +77,11 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('newstate'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('New State'), Message::create( LimitationIdentifierToLabelConverter::convert('state'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('State'), ]; } diff --git a/src/lib/Limitation/Mapper/OwnerLimitationMapper.php b/src/lib/Limitation/Mapper/OwnerLimitationMapper.php index e575b431a2..0e8ba24b5c 100644 --- a/src/lib/Limitation/Mapper/OwnerLimitationMapper.php +++ b/src/lib/Limitation/Mapper/OwnerLimitationMapper.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Annotation\Desc; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -32,7 +33,7 @@ protected function getSelectionChoices() 1 => $this->translator->trans(/** @Desc("Self") */ 'policy.limitation.owner.self', [], - 'ezplatform_content_forms_role' + 'ibexa_content_forms_role' ), ]; } @@ -43,7 +44,7 @@ public function mapLimitationValue(Limitation $limitation) $this->translator->trans(/** @Desc("Self") */ 'policy.limitation.owner.self', [], - 'ezplatform_content_forms_role' + 'ibexa_content_forms_role' ), ]; } @@ -53,11 +54,11 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('owner'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Owner'), Message::create( LimitationIdentifierToLabelConverter::convert('parentowner'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Owner of Parent'), ]; } diff --git a/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php b/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php index 8721ab294b..38d6674c6e 100644 --- a/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php @@ -44,7 +44,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('parentdepth'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Parent Depth'), ]; } diff --git a/src/lib/Limitation/Mapper/RoleLimitationMapper.php b/src/lib/Limitation/Mapper/RoleLimitationMapper.php index 24e53702c0..e05468e87d 100644 --- a/src/lib/Limitation/Mapper/RoleLimitationMapper.php +++ b/src/lib/Limitation/Mapper/RoleLimitationMapper.php @@ -51,7 +51,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('role'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Role'), ]; } diff --git a/src/lib/Limitation/Mapper/SectionLimitationMapper.php b/src/lib/Limitation/Mapper/SectionLimitationMapper.php index 1ecb313cb7..185bbf9c09 100644 --- a/src/lib/Limitation/Mapper/SectionLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SectionLimitationMapper.php @@ -60,11 +60,11 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('newsection'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('New Section'), Message::create( LimitationIdentifierToLabelConverter::convert('section'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Section'), ]; } diff --git a/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php b/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php index 89d643feb0..c0ad4345f5 100644 --- a/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php @@ -57,7 +57,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('siteaccess'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('SiteAccess'), ]; } diff --git a/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php b/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php index a74d9c8dfc..b47fd6e4b0 100755 --- a/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php @@ -71,7 +71,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('subtree'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Subtree'), ]; } diff --git a/src/lib/Limitation/Mapper/UDWBasedMapper.php b/src/lib/Limitation/Mapper/UDWBasedMapper.php index bc74fadadd..135bfbc902 100755 --- a/src/lib/Limitation/Mapper/UDWBasedMapper.php +++ b/src/lib/Limitation/Mapper/UDWBasedMapper.php @@ -129,7 +129,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('node'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('Location'), ]; } diff --git a/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php b/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php index d2771dda15..26e37a044e 100644 --- a/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php +++ b/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php @@ -139,7 +139,7 @@ public static function getTranslationMessages(): array return [ Message::create( LimitationIdentifierToLabelConverter::convert('userpermissions'), - 'ezplatform_content_forms_policies' + 'ibexa_content_forms_policies' )->setDesc('User Permissions'), ]; } diff --git a/src/lib/Menu/Admin/ContentType/AbstractContentTypeRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/AbstractContentTypeRightSidebarBuilder.php index 521d624ae6..7fb95b14bb 100644 --- a/src/lib/Menu/Admin/ContentType/AbstractContentTypeRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/AbstractContentTypeRightSidebarBuilder.php @@ -9,10 +9,9 @@ namespace Ibexa\AdminUi\Menu\Admin\ContentType; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; -use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; -abstract class AbstractContentTypeRightSidebarBuilder extends AbstractBuilder implements TranslationContainerInterface +abstract class AbstractContentTypeRightSidebarBuilder extends AbstractBuilder { public function createStructure(array $options): ItemInterface { diff --git a/src/lib/Menu/Admin/ContentType/ContentTypeCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/ContentTypeCreateRightSidebarBuilder.php index 457d7e0df3..fbcb772190 100644 --- a/src/lib/Menu/Admin/ContentType/ContentTypeCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/ContentTypeCreateRightSidebarBuilder.php @@ -8,13 +8,14 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; /** * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. * * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html */ -class ContentTypeCreateRightSidebarBuilder extends AbstractContentTypeRightSidebarBuilder +class ContentTypeCreateRightSidebarBuilder extends AbstractContentTypeRightSidebarBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__SAVE = 'content_type_create__sidebar_right__save'; @@ -31,8 +32,8 @@ protected function getConfigureEventName(): string public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } diff --git a/src/lib/Menu/Admin/ContentType/ContentTypeEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/ContentTypeEditRightSidebarBuilder.php index af5168029a..852c6e1401 100644 --- a/src/lib/Menu/Admin/ContentType/ContentTypeEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/ContentTypeEditRightSidebarBuilder.php @@ -8,13 +8,14 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; /** * KnpMenuBundle Menu Builder service implementation for AdminUI Section Edit contextual sidebar menu. * * @see https://symfony.com/doc/current/bundles/KnpMenuBundle/menu_builder_service.html */ -class ContentTypeEditRightSidebarBuilder extends AbstractContentTypeRightSidebarBuilder +class ContentTypeEditRightSidebarBuilder extends AbstractContentTypeRightSidebarBuilder implements TranslationContainerInterface { /* Menu items */ public const ITEM__SAVE = 'content_type_edit__sidebar_right__save'; @@ -31,8 +32,8 @@ protected function getConfigureEventName(): string public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } diff --git a/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php index c6441caaeb..20a7c4a1ea 100644 --- a/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/ContentTypeGroupCreateRightSidebarBuilder.php @@ -89,8 +89,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php index f4dd9fb90a..f771efc140 100644 --- a/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ContentType/ContentTypeGroupEditRightSidebarBuilder.php @@ -91,8 +91,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php index 920bd37e44..66648b5ba1 100644 --- a/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Language/LanguageCreateRightSidebarBuilder.php @@ -89,8 +89,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Add'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Add'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } } diff --git a/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php b/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php index fc452d5205..bdbc9a9359 100644 --- a/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Language/LanguageEditRightSidebarBuilder.php @@ -92,8 +92,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php index 3bf4d2ed13..4be4d90feb 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateCreateRightSidebarBuilder.php @@ -80,8 +80,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php index 23c80261b8..5bd173ed8b 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateEditRightSidebarBuilder.php @@ -81,8 +81,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php index fb0bedddd4..19f1156a18 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupCreateRightSidebarBuilder.php @@ -91,8 +91,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php index 8415b2d012..93e8868fe2 100644 --- a/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/ObjectState/ObjectStateGroupEditRightSidebarBuilder.php @@ -93,8 +93,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php index cd0a0dd926..569e434242 100644 --- a/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/PolicyCreateRightSidebarBuilder.php @@ -79,8 +79,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php index 8961d1ef51..7a133fef66 100644 --- a/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/PolicyEditRightSidebarBuilder.php @@ -82,8 +82,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Update'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Update'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php index 7c10a22af6..dcc9da59c4 100644 --- a/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleAssignmentCreateRightSidebarBuilder.php @@ -79,8 +79,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } } diff --git a/src/lib/Menu/Admin/Role/RoleCopyRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleCopyRightSidebarBuilder.php index d7934dbdb4..c64077fe5d 100644 --- a/src/lib/Menu/Admin/Role/RoleCopyRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleCopyRightSidebarBuilder.php @@ -9,6 +9,7 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\AdminUi\Menu\MenuItemFactory; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; +use JMS\TranslationBundle\Annotation\Ignore; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; @@ -65,7 +66,7 @@ public function createStructure(array $options): ItemInterface /** @Ignore */ self::ITEM__SAVE, [], - 'menu' + 'ibexa_menu' ), ], ] @@ -80,7 +81,7 @@ public function createStructure(array $options): ItemInterface /** @Ignore */ self::ITEM__CANCEL, [], - 'menu' + 'ibexa_menu' ), ], 'route' => 'ibexa.role.list', @@ -97,8 +98,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Copy'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Copy'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php index 65c16558f9..5ad79915a2 100644 --- a/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleCreateRightSidebarBuilder.php @@ -89,8 +89,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php b/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php index 22a89073a6..89216142f0 100644 --- a/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php +++ b/src/lib/Menu/Admin/Role/RoleEditRightSidebarBuilder.php @@ -92,8 +92,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/ContentCreateRightSidebarBuilder.php b/src/lib/Menu/ContentCreateRightSidebarBuilder.php index c838adb021..2db2e82eeb 100644 --- a/src/lib/Menu/ContentCreateRightSidebarBuilder.php +++ b/src/lib/Menu/ContentCreateRightSidebarBuilder.php @@ -174,10 +174,10 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__PUBLISH, 'menu'))->setDesc('Publish'), - (new Message(self::ITEM__SAVE_DRAFT, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__PREVIEW, 'menu'))->setDesc('Preview'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__PUBLISH, 'ibexa_menu'))->setDesc('Publish'), + (new Message(self::ITEM__SAVE_DRAFT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__PREVIEW, 'ibexa_menu'))->setDesc('Preview'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } diff --git a/src/lib/Menu/ContentEditAnchorMenuBuilder.php b/src/lib/Menu/ContentEditAnchorMenuBuilder.php index 06896a46e4..2745eb05f8 100644 --- a/src/lib/Menu/ContentEditAnchorMenuBuilder.php +++ b/src/lib/Menu/ContentEditAnchorMenuBuilder.php @@ -189,8 +189,8 @@ private function createSecondLevelItem( public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CONTENT, 'menu'))->setDesc('Content'), - (new Message(self::ITEM__META, 'menu'))->setDesc('Meta'), + (new Message(self::ITEM__CONTENT, 'ibexa_menu'))->setDesc('Content'), + (new Message(self::ITEM__META, 'ibexa_menu'))->setDesc('Meta'), ]; } } diff --git a/src/lib/Menu/ContentEditRightSidebarBuilder.php b/src/lib/Menu/ContentEditRightSidebarBuilder.php index 08713838b6..6d3bb19816 100644 --- a/src/lib/Menu/ContentEditRightSidebarBuilder.php +++ b/src/lib/Menu/ContentEditRightSidebarBuilder.php @@ -170,10 +170,10 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__PUBLISH, 'menu'))->setDesc('Publish'), - (new Message(self::ITEM__SAVE_DRAFT, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__PREVIEW, 'menu'))->setDesc('Preview'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Delete draft'), + (new Message(self::ITEM__PUBLISH, 'ibexa_menu'))->setDesc('Publish'), + (new Message(self::ITEM__SAVE_DRAFT, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__PREVIEW, 'ibexa_menu'))->setDesc('Preview'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Delete draft'), ]; } diff --git a/src/lib/Menu/ContentRightSidebarBuilder.php b/src/lib/Menu/ContentRightSidebarBuilder.php index 4833b215a8..520f4f02e2 100644 --- a/src/lib/Menu/ContentRightSidebarBuilder.php +++ b/src/lib/Menu/ContentRightSidebarBuilder.php @@ -299,16 +299,16 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create content'), - (new Message(self::ITEM__EDIT, 'menu'))->setDesc('Edit'), - (new Message(self::ITEM__SEND_TO_TRASH, 'menu'))->setDesc('Send to trash'), - (new Message(self::ITEM__COPY, 'menu'))->setDesc('Copy'), - (new Message(self::ITEM__COPY_SUBTREE, 'menu'))->setDesc('Copy Subtree'), - (new Message(self::ITEM__MOVE, 'menu'))->setDesc('Move'), - (new Message(self::ITEM__DELETE, 'menu'))->setDesc('Delete'), - (new Message(self::ITEM__HIDE, 'menu'))->setDesc('Hide'), - (new Message(self::ITEM__REVEAL, 'menu'))->setDesc('Reveal'), - (new Message(self::ITEM__INVITE, 'menu'))->setDesc('Invite members'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create content'), + (new Message(self::ITEM__EDIT, 'ibexa_menu'))->setDesc('Edit'), + (new Message(self::ITEM__SEND_TO_TRASH, 'ibexa_menu'))->setDesc('Send to trash'), + (new Message(self::ITEM__COPY, 'ibexa_menu'))->setDesc('Copy'), + (new Message(self::ITEM__COPY_SUBTREE, 'ibexa_menu'))->setDesc('Copy Subtree'), + (new Message(self::ITEM__MOVE, 'ibexa_menu'))->setDesc('Move'), + (new Message(self::ITEM__DELETE, 'ibexa_menu'))->setDesc('Delete'), + (new Message(self::ITEM__HIDE, 'ibexa_menu'))->setDesc('Hide'), + (new Message(self::ITEM__REVEAL, 'ibexa_menu'))->setDesc('Reveal'), + (new Message(self::ITEM__INVITE, 'ibexa_menu'))->setDesc('Invite members'), ]; } diff --git a/src/lib/Menu/ContentTypeEditAnchorMenuBuilder.php b/src/lib/Menu/ContentTypeEditAnchorMenuBuilder.php index 004c32fe08..0bc916cd84 100644 --- a/src/lib/Menu/ContentTypeEditAnchorMenuBuilder.php +++ b/src/lib/Menu/ContentTypeEditAnchorMenuBuilder.php @@ -129,8 +129,8 @@ private function createMetaMenuItem( public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__GLOBAL_PROPERTIES, 'menu'))->setDesc('Global properties'), - (new Message(self::ITEM__FIELD_DEFINITIONS, 'menu'))->setDesc('Field definitions'), + (new Message(self::ITEM__GLOBAL_PROPERTIES, 'ibexa_menu'))->setDesc('Global properties'), + (new Message(self::ITEM__FIELD_DEFINITIONS, 'ibexa_menu'))->setDesc('Field definitions'), ]; } } diff --git a/src/lib/Menu/ContentTypeRightSidebarBuilder.php b/src/lib/Menu/ContentTypeRightSidebarBuilder.php index b960334199..a3ce5cb0e6 100644 --- a/src/lib/Menu/ContentTypeRightSidebarBuilder.php +++ b/src/lib/Menu/ContentTypeRightSidebarBuilder.php @@ -104,7 +104,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__EDIT, 'menu'))->setDesc('Edit'), + (new Message(self::ITEM__EDIT, 'ibexa_menu'))->setDesc('Edit'), ]; } } diff --git a/src/lib/Menu/LeftSidebarBuilder.php b/src/lib/Menu/LeftSidebarBuilder.php index 2c88930ed1..f33b09aa59 100644 --- a/src/lib/Menu/LeftSidebarBuilder.php +++ b/src/lib/Menu/LeftSidebarBuilder.php @@ -142,11 +142,11 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SEARCH, 'menu'))->setDesc('Search'), - (new Message(self::ITEM__BROWSE, 'menu'))->setDesc('Browse'), - (new Message(self::ITEM__TREE, 'menu'))->setDesc('Content Tree'), - (new Message(self::ITEM__TRASH, 'menu'))->setDesc('Trash'), - (new Message(self::ITEM__BOOKMARK, 'menu'))->setDesc('Bookmarks'), + (new Message(self::ITEM__SEARCH, 'ibexa_menu'))->setDesc('Search'), + (new Message(self::ITEM__BROWSE, 'ibexa_menu'))->setDesc('Browse'), + (new Message(self::ITEM__TREE, 'ibexa_menu'))->setDesc('Content Tree'), + (new Message(self::ITEM__TRASH, 'ibexa_menu'))->setDesc('Trash'), + (new Message(self::ITEM__BOOKMARK, 'ibexa_menu'))->setDesc('Bookmarks'), ]; } } diff --git a/src/lib/Menu/MainMenuBuilder.php b/src/lib/Menu/MainMenuBuilder.php index 0e69432501..b7552267aa 100644 --- a/src/lib/Menu/MainMenuBuilder.php +++ b/src/lib/Menu/MainMenuBuilder.php @@ -367,21 +367,21 @@ private function addAdminMenuItems(ItemInterface $menu): void public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM_DASHBOARD, 'menu'))->setDesc('Dashboard'), - (new Message(self::ITEM_BOOKMARKS, 'menu'))->setDesc('Bookmarks'), - (new Message(self::ITEM_TRASH, 'menu'))->setDesc('Trash'), - (new Message(self::ITEM_CONTENT, 'menu'))->setDesc('Content'), - (new Message(self::ITEM_CONTENT_GROUP_SETTINGS, 'menu'))->setDesc('Settings'), - (new Message(self::ITEM_CONTENT__CONTENT_STRUCTURE, 'menu'))->setDesc('Content structure'), - (new Message(self::ITEM_CONTENT__MEDIA, 'menu'))->setDesc('Media'), - (new Message(self::ITEM_ADMIN, 'menu'))->setDesc('Admin'), - (new Message(self::ITEM_ADMIN__SECTIONS, 'menu'))->setDesc('Sections'), - (new Message(self::ITEM_ADMIN__ROLES, 'menu'))->setDesc('Roles'), - (new Message(self::ITEM_ADMIN__LANGUAGES, 'menu'))->setDesc('Languages'), - (new Message(self::ITEM_ADMIN__CONTENT_TYPES, 'menu'))->setDesc('Content Types'), - (new Message(self::ITEM_ADMIN__USERS, 'menu'))->setDesc('Users'), - (new Message(self::ITEM_ADMIN__OBJECT_STATES, 'menu'))->setDesc('Object States'), - (new Message(self::ITEM_ADMIN__URL_MANAGEMENT, 'menu'))->setDesc('URL management'), + (new Message(self::ITEM_DASHBOARD, 'ibexa_menu'))->setDesc('Dashboard'), + (new Message(self::ITEM_BOOKMARKS, 'ibexa_menu'))->setDesc('Bookmarks'), + (new Message(self::ITEM_TRASH, 'ibexa_menu'))->setDesc('Trash'), + (new Message(self::ITEM_CONTENT, 'ibexa_menu'))->setDesc('Content'), + (new Message(self::ITEM_CONTENT_GROUP_SETTINGS, 'ibexa_menu'))->setDesc('Settings'), + (new Message(self::ITEM_CONTENT__CONTENT_STRUCTURE, 'ibexa_menu'))->setDesc('Content structure'), + (new Message(self::ITEM_CONTENT__MEDIA, 'ibexa_menu'))->setDesc('Media'), + (new Message(self::ITEM_ADMIN, 'ibexa_menu'))->setDesc('Admin'), + (new Message(self::ITEM_ADMIN__SECTIONS, 'ibexa_menu'))->setDesc('Sections'), + (new Message(self::ITEM_ADMIN__ROLES, 'ibexa_menu'))->setDesc('Roles'), + (new Message(self::ITEM_ADMIN__LANGUAGES, 'ibexa_menu'))->setDesc('Languages'), + (new Message(self::ITEM_ADMIN__CONTENT_TYPES, 'ibexa_menu'))->setDesc('Content Types'), + (new Message(self::ITEM_ADMIN__USERS, 'ibexa_menu'))->setDesc('Users'), + (new Message(self::ITEM_ADMIN__OBJECT_STATES, 'ibexa_menu'))->setDesc('Object States'), + (new Message(self::ITEM_ADMIN__URL_MANAGEMENT, 'ibexa_menu'))->setDesc('URL management'), ]; } } diff --git a/src/lib/Menu/MenuItemFactory.php b/src/lib/Menu/MenuItemFactory.php index fb87e01d9b..605d57f735 100644 --- a/src/lib/Menu/MenuItemFactory.php +++ b/src/lib/Menu/MenuItemFactory.php @@ -70,7 +70,7 @@ public function createLocationMenuItem(string $name, int $locationId, array $opt public function createItem($name, array $options = []): ItemInterface { if (empty($options['extras']['translation_domain'])) { - $options['extras']['translation_domain'] = 'menu'; + $options['extras']['translation_domain'] = 'ibexa_menu'; } $item = $this->factory->createItem($name, $options); diff --git a/src/lib/Menu/SectionCreateRightSidebarBuilder.php b/src/lib/Menu/SectionCreateRightSidebarBuilder.php index e3bfd31aeb..0423cb020a 100644 --- a/src/lib/Menu/SectionCreateRightSidebarBuilder.php +++ b/src/lib/Menu/SectionCreateRightSidebarBuilder.php @@ -88,8 +88,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/SectionEditRightSidebarBuilder.php b/src/lib/Menu/SectionEditRightSidebarBuilder.php index 3b034027e8..7e42e87610 100644 --- a/src/lib/Menu/SectionEditRightSidebarBuilder.php +++ b/src/lib/Menu/SectionEditRightSidebarBuilder.php @@ -92,8 +92,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/TrashRightSidebarBuilder.php b/src/lib/Menu/TrashRightSidebarBuilder.php index dfd3122927..15b007373e 100644 --- a/src/lib/Menu/TrashRightSidebarBuilder.php +++ b/src/lib/Menu/TrashRightSidebarBuilder.php @@ -99,7 +99,7 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__EMPTY, 'menu'))->setDesc('Empty Trash'), + (new Message(self::ITEM__EMPTY, 'ibexa_menu'))->setDesc('Empty Trash'), ]; } } diff --git a/src/lib/Menu/URLEditRightSidebarBuilder.php b/src/lib/Menu/URLEditRightSidebarBuilder.php index 45d8d96a98..4889e442ae 100644 --- a/src/lib/Menu/URLEditRightSidebarBuilder.php +++ b/src/lib/Menu/URLEditRightSidebarBuilder.php @@ -70,8 +70,8 @@ protected function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php b/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php index b34db784ab..571db30c1f 100644 --- a/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php +++ b/src/lib/Menu/URLWildcardEditRightSidebarBuilder.php @@ -42,8 +42,8 @@ public function __construct( public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } diff --git a/src/lib/Menu/UserCreateRightSidebarBuilder.php b/src/lib/Menu/UserCreateRightSidebarBuilder.php index 42c370e405..3897fe812d 100644 --- a/src/lib/Menu/UserCreateRightSidebarBuilder.php +++ b/src/lib/Menu/UserCreateRightSidebarBuilder.php @@ -76,8 +76,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } } diff --git a/src/lib/Menu/UserEditRightSidebarBuilder.php b/src/lib/Menu/UserEditRightSidebarBuilder.php index 461c823261..56c027d5c0 100644 --- a/src/lib/Menu/UserEditRightSidebarBuilder.php +++ b/src/lib/Menu/UserEditRightSidebarBuilder.php @@ -76,8 +76,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__UPDATE, 'menu'))->setDesc('Update'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Cancel'), + (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'), ]; } } diff --git a/src/lib/Menu/UserMenuBuilder.php b/src/lib/Menu/UserMenuBuilder.php index 2e57477aac..4b20bd56fd 100644 --- a/src/lib/Menu/UserMenuBuilder.php +++ b/src/lib/Menu/UserMenuBuilder.php @@ -109,10 +109,10 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM_LOGOUT, 'menu'))->setDesc('Logout'), - (new Message(self::ITEM_USER_SETTINGS, 'menu'))->setDesc('User settings'), - (new Message(self::ITEM_DRAFTS, 'menu'))->setDesc('Drafts'), - (new Message(self::ITEM_NOTIFICATION, 'notifications'))->setDesc('View Notifications'), + (new Message(self::ITEM_LOGOUT, 'ibexa_menu'))->setDesc('Logout'), + (new Message(self::ITEM_USER_SETTINGS, 'ibexa_menu'))->setDesc('User settings'), + (new Message(self::ITEM_DRAFTS, 'ibexa_menu'))->setDesc('Drafts'), + (new Message(self::ITEM_NOTIFICATION, 'ibexa_notifications'))->setDesc('View Notifications'), ]; } } diff --git a/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php b/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php index 51427b51b6..97a837b45e 100644 --- a/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php +++ b/src/lib/Menu/UserPasswordChangeRightSidebarBuilder.php @@ -90,8 +90,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__UPDATE, 'menu'))->setDesc('Update'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php b/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php index 997cbb5019..fe44cc897d 100644 --- a/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php +++ b/src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php @@ -88,8 +88,8 @@ public function createStructure(array $options): ItemInterface public static function getTranslationMessages(): array { return [ - (new Message(self::ITEM__SAVE, 'menu'))->setDesc('Save'), - (new Message(self::ITEM__CANCEL, 'menu'))->setDesc('Discard changes'), + (new Message(self::ITEM__SAVE, 'ibexa_menu'))->setDesc('Save'), + (new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'), ]; } } diff --git a/src/lib/Service/MetaFieldType/MetaFieldDefinitionService.php b/src/lib/Service/MetaFieldType/MetaFieldDefinitionService.php index 824099169d..06a10178df 100644 --- a/src/lib/Service/MetaFieldType/MetaFieldDefinitionService.php +++ b/src/lib/Service/MetaFieldType/MetaFieldDefinitionService.php @@ -20,6 +20,7 @@ use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Helper\FieldsGroups\FieldsGroupsList; use Ibexa\Core\MVC\Symfony\Locale\LocaleConverterInterface; +use JMS\TranslationBundle\Annotation\Ignore; use Symfony\Contracts\Translation\TranslatorInterface; /** @@ -106,7 +107,7 @@ public function createMetaFieldDefinitionCreateStruct( $label = $this->translator->trans(/** @Ignore */ $identifier . '.name', [], - 'fieldtypes', + 'ibexa_fieldtypes', $this->localeConverter->convertToPOSIX($language->languageCode) ); diff --git a/src/lib/Tab/ContentType/TranslationsTab.php b/src/lib/Tab/ContentType/TranslationsTab.php index a74dbc95bd..3de39d2957 100644 --- a/src/lib/Tab/ContentType/TranslationsTab.php +++ b/src/lib/Tab/ContentType/TranslationsTab.php @@ -14,6 +14,7 @@ use Ibexa\AdminUi\UI\Dataset\DatasetFactory; use Ibexa\Contracts\AdminUi\Tab\AbstractEventDispatchingTab; use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Twig\Environment; @@ -62,7 +63,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Translations") */ - return $this->translator->trans('tab.name.translations', [], 'content_type'); + return $this->translator->trans('tab.name.translations', [], 'ibexa_content_type'); } /** diff --git a/src/lib/Tab/ContentType/ViewTab.php b/src/lib/Tab/ContentType/ViewTab.php index 197dfdbd55..6525acbbb7 100644 --- a/src/lib/Tab/ContentType/ViewTab.php +++ b/src/lib/Tab/ContentType/ViewTab.php @@ -10,6 +10,7 @@ use Ibexa\Contracts\AdminUi\Tab\AbstractEventDispatchingTab; use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; +use JMS\TranslationBundle\Annotation\Desc; class ViewTab extends AbstractEventDispatchingTab implements OrderedTabInterface { @@ -29,7 +30,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("View") */ - return $this->translator->trans('tab.name.view', [], 'content_type'); + return $this->translator->trans('tab.name.view', [], 'ibexa_content_type'); } /** diff --git a/src/lib/Tab/Dashboard/EveryoneContentTab.php b/src/lib/Tab/Dashboard/EveryoneContentTab.php index 4a7b29bd91..062f8e3071 100644 --- a/src/lib/Tab/Dashboard/EveryoneContentTab.php +++ b/src/lib/Tab/Dashboard/EveryoneContentTab.php @@ -10,6 +10,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Core\Pagination\Pagerfanta\LocationSearchAdapter; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; class EveryoneContentTab extends AbstractContentTab implements OrderedTabInterface @@ -22,7 +23,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("Content") */ - $this->translator->trans('tab.name.everyone_content', [], 'dashboard'); + $this->translator->trans('tab.name.everyone_content', [], 'ibexa_dashboard'); } public function getOrder(): int diff --git a/src/lib/Tab/Dashboard/EveryoneMediaTab.php b/src/lib/Tab/Dashboard/EveryoneMediaTab.php index 3ad3ec8c6c..b1b12a765b 100644 --- a/src/lib/Tab/Dashboard/EveryoneMediaTab.php +++ b/src/lib/Tab/Dashboard/EveryoneMediaTab.php @@ -10,6 +10,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Core\Pagination\Pagerfanta\LocationSearchAdapter; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; class EveryoneMediaTab extends AbstractMediaTab implements OrderedTabInterface @@ -22,7 +23,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("Media") */ - $this->translator->trans('tab.name.everyone_media', [], 'dashboard'); + $this->translator->trans('tab.name.everyone_media', [], 'ibexa_dashboard'); } public function getOrder(): int diff --git a/src/lib/Tab/Dashboard/MyContentTab.php b/src/lib/Tab/Dashboard/MyContentTab.php index 086187f05f..33cf270d61 100644 --- a/src/lib/Tab/Dashboard/MyContentTab.php +++ b/src/lib/Tab/Dashboard/MyContentTab.php @@ -10,6 +10,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Core\Pagination\Pagerfanta\LocationSearchAdapter; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; class MyContentTab extends AbstractContentTab implements OrderedTabInterface @@ -22,7 +23,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("Content") */ - $this->translator->trans('tab.name.my_content', [], 'dashboard'); + $this->translator->trans('tab.name.my_content', [], 'ibexa_dashboard'); } public function getOrder(): int diff --git a/src/lib/Tab/Dashboard/MyDraftsTab.php b/src/lib/Tab/Dashboard/MyDraftsTab.php index a2ba6dfb40..ec02c672eb 100644 --- a/src/lib/Tab/Dashboard/MyDraftsTab.php +++ b/src/lib/Tab/Dashboard/MyDraftsTab.php @@ -17,6 +17,7 @@ use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Contracts\Translation\TranslatorInterface; @@ -78,7 +79,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("Drafts") */ - $this->translator->trans('tab.name.my_drafts', [], 'dashboard'); + $this->translator->trans('tab.name.my_drafts', [], 'ibexa_dashboard'); } /** diff --git a/src/lib/Tab/Dashboard/MyMediaTab.php b/src/lib/Tab/Dashboard/MyMediaTab.php index b0783810a2..19821c22f3 100644 --- a/src/lib/Tab/Dashboard/MyMediaTab.php +++ b/src/lib/Tab/Dashboard/MyMediaTab.php @@ -10,6 +10,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Core\Pagination\Pagerfanta\LocationSearchAdapter; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; class MyMediaTab extends AbstractMediaTab implements OrderedTabInterface @@ -22,7 +23,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("Media") */ - $this->translator->trans('tab.name.my_media', [], 'dashboard'); + $this->translator->trans('tab.name.my_media', [], 'ibexa_dashboard'); } public function getOrder(): int diff --git a/src/lib/Tab/LocationView/ContentTab.php b/src/lib/Tab/LocationView/ContentTab.php index 551e010476..578d22fca4 100644 --- a/src/lib/Tab/LocationView/ContentTab.php +++ b/src/lib/Tab/LocationView/ContentTab.php @@ -15,6 +15,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Twig\Environment; @@ -53,7 +54,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("View") */ - return $this->translator->trans('tab.name.view', [], 'locationview'); + return $this->translator->trans('tab.name.view', [], 'ibexa_locationview'); } public function getOrder(): int diff --git a/src/lib/Tab/LocationView/DetailsTab.php b/src/lib/Tab/LocationView/DetailsTab.php index 245dfbe983..5b94b46c9f 100644 --- a/src/lib/Tab/LocationView/DetailsTab.php +++ b/src/lib/Tab/LocationView/DetailsTab.php @@ -25,6 +25,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -95,7 +96,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Details") */ - return $this->translator->trans('tab.name.details', [], 'locationview'); + return $this->translator->trans('tab.name.details', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/LocationView/LocationsTab.php b/src/lib/Tab/LocationView/LocationsTab.php index 09aabe2cf9..82af05294d 100644 --- a/src/lib/Tab/LocationView/LocationsTab.php +++ b/src/lib/Tab/LocationView/LocationsTab.php @@ -24,6 +24,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Pagination\Pagerfanta\LocationSearchAdapter; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\FormInterface; @@ -107,7 +108,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Locations") */ - return $this->translator->trans('tab.name.locations', [], 'locationview'); + return $this->translator->trans('tab.name.locations', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/LocationView/PoliciesTab.php b/src/lib/Tab/LocationView/PoliciesTab.php index bffeb7e25e..6d9294b4ed 100644 --- a/src/lib/Tab/LocationView/PoliciesTab.php +++ b/src/lib/Tab/LocationView/PoliciesTab.php @@ -17,6 +17,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -67,7 +68,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Policies") */ - return $this->translator->trans('tab.name.policies', [], 'locationview'); + return $this->translator->trans('tab.name.policies', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/LocationView/RelationsTab.php b/src/lib/Tab/LocationView/RelationsTab.php index d8c97012af..78bafd0ef9 100644 --- a/src/lib/Tab/LocationView/RelationsTab.php +++ b/src/lib/Tab/LocationView/RelationsTab.php @@ -16,6 +16,7 @@ use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\PermissionResolver; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -77,7 +78,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Relations") */ - return $this->translator->trans('tab.name.relations', [], 'locationview'); + return $this->translator->trans('tab.name.relations', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/LocationView/RolesTab.php b/src/lib/Tab/LocationView/RolesTab.php index 3907537ae8..4ab920a835 100644 --- a/src/lib/Tab/LocationView/RolesTab.php +++ b/src/lib/Tab/LocationView/RolesTab.php @@ -17,6 +17,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -67,7 +68,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Roles") */ - return $this->translator->trans('tab.name.roles', [], 'locationview'); + return $this->translator->trans('tab.name.roles', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/LocationView/TranslationsTab.php b/src/lib/Tab/LocationView/TranslationsTab.php index 945d80133b..7f71442b47 100644 --- a/src/lib/Tab/LocationView/TranslationsTab.php +++ b/src/lib/Tab/LocationView/TranslationsTab.php @@ -22,6 +22,7 @@ use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\Form\FormInterface; @@ -84,7 +85,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Translations") */ - return $this->translator->trans('tab.name.translations', [], 'locationview'); + return $this->translator->trans('tab.name.translations', [], 'ibexa_locationview'); } public function getOrder(): int diff --git a/src/lib/Tab/LocationView/UrlsTab.php b/src/lib/Tab/LocationView/UrlsTab.php index bad0d01065..b9be1ba1e6 100644 --- a/src/lib/Tab/LocationView/UrlsTab.php +++ b/src/lib/Tab/LocationView/UrlsTab.php @@ -21,6 +21,7 @@ use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Core\Helper\TranslationHelper; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -96,7 +97,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("URL") */ - return $this->translator->trans('tab.name.urls', [], 'locationview'); + return $this->translator->trans('tab.name.urls', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/LocationView/VersionsTab.php b/src/lib/Tab/LocationView/VersionsTab.php index 2a3f75135e..ba3197b81f 100644 --- a/src/lib/Tab/LocationView/VersionsTab.php +++ b/src/lib/Tab/LocationView/VersionsTab.php @@ -19,6 +19,7 @@ use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -91,7 +92,7 @@ public function getIdentifier(): string public function getName(): string { /** @Desc("Versions") */ - return $this->translator->trans('tab.name.versions', [], 'locationview'); + return $this->translator->trans('tab.name.versions', [], 'ibexa_locationview'); } /** diff --git a/src/lib/Tab/URLManagement/LinkManagerTab.php b/src/lib/Tab/URLManagement/LinkManagerTab.php index 9ae49088a7..67822d0f1c 100644 --- a/src/lib/Tab/URLManagement/LinkManagerTab.php +++ b/src/lib/Tab/URLManagement/LinkManagerTab.php @@ -21,6 +21,7 @@ use Ibexa\Contracts\Core\Repository\Values\URL\Query\Criterion; use Ibexa\Contracts\Core\Repository\Values\URL\Query\SortClause; use Ibexa\Contracts\Core\Repository\Values\URL\URLQuery; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; @@ -81,7 +82,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("Link manager") */ - $this->translator->trans('tab.name.link_manager', [], 'linkmanager'); + $this->translator->trans('tab.name.link_manager', [], 'ibexa_linkmanager'); } public function getOrder(): int diff --git a/src/lib/Tab/URLManagement/URLWildcardsTab.php b/src/lib/Tab/URLManagement/URLWildcardsTab.php index 951be5902d..4a4eb7213c 100644 --- a/src/lib/Tab/URLManagement/URLWildcardsTab.php +++ b/src/lib/Tab/URLManagement/URLWildcardsTab.php @@ -22,6 +22,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard\Query\SortClause; use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard\URLWildcardQuery; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; +use JMS\TranslationBundle\Annotation\Desc; use Pagerfanta\Pagerfanta; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; @@ -83,7 +84,7 @@ public function getIdentifier(): string public function getName(): string { return /** @Desc("URL wildcards") */ - $this->translator->trans('tab.name.url_wildcards', [], 'url_wildcard'); + $this->translator->trans('tab.name.url_wildcards', [], 'ibexa_url_wildcard'); } /** diff --git a/src/lib/Translation/Extractor/LimitationTranslationExtractor.php b/src/lib/Translation/Extractor/LimitationTranslationExtractor.php index 8dabba762e..224483c56b 100644 --- a/src/lib/Translation/Extractor/LimitationTranslationExtractor.php +++ b/src/lib/Translation/Extractor/LimitationTranslationExtractor.php @@ -20,7 +20,7 @@ */ class LimitationTranslationExtractor implements ExtractorInterface { - public const MESSAGE_DOMAIN = 'ezplatform_content_forms_policies'; + public const MESSAGE_DOMAIN = 'ibexa_content_forms_policies'; public const MESSAGE_ID_PREFIX = LimitationIdentifierToLabelConverter::MESSAGE_ID_PREFIX; /** diff --git a/src/lib/Translation/Extractor/SortingTranslationExtractor.php b/src/lib/Translation/Extractor/SortingTranslationExtractor.php index a38c512de0..092bb722e3 100644 --- a/src/lib/Translation/Extractor/SortingTranslationExtractor.php +++ b/src/lib/Translation/Extractor/SortingTranslationExtractor.php @@ -31,7 +31,7 @@ class SortingTranslationExtractor implements ExtractorInterface 9 => 'Content name', ]; - private $domain = 'content_type'; + private $domain = 'ibexa_content_type'; public function extract() { diff --git a/src/lib/UI/Module/FieldTypeToolbar/FieldTypeToolbarFactory.php b/src/lib/UI/Module/FieldTypeToolbar/FieldTypeToolbarFactory.php index 477c5cb8fe..94c0a33b64 100644 --- a/src/lib/UI/Module/FieldTypeToolbar/FieldTypeToolbarFactory.php +++ b/src/lib/UI/Module/FieldTypeToolbar/FieldTypeToolbarFactory.php @@ -12,6 +12,7 @@ use Ibexa\AdminUi\UI\Module\FieldTypeToolbar\Values\FieldTypeToolbar; use Ibexa\AdminUi\UI\Module\FieldTypeToolbar\Values\FieldTypeToolbarItem; use Ibexa\Core\FieldType\FieldTypeRegistry; +use JMS\TranslationBundle\Annotation\Ignore; use Symfony\Contracts\Translation\TranslatorInterface; /** @@ -75,7 +76,7 @@ private function getFieldTypeLabel(string $fieldTypeIdentifier): string return $this->translator->trans(/** @Ignore */ $fieldTypeIdentifier . '.name', [], - 'fieldtypes' + 'ibexa_fieldtypes' ); } } diff --git a/src/lib/UI/Service/DateTimeFormatter.php b/src/lib/UI/Service/DateTimeFormatter.php index a47fe0e42e..e41cec96a3 100644 --- a/src/lib/UI/Service/DateTimeFormatter.php +++ b/src/lib/UI/Service/DateTimeFormatter.php @@ -9,6 +9,8 @@ namespace Ibexa\AdminUi\UI\Service; use DateTimeInterface; +use JMS\TranslationBundle\Annotation\Desc; +use JMS\TranslationBundle\Annotation\Ignore; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -58,7 +60,7 @@ private function getDiffMessage(int $count, bool $invert, string $unit): string { $id = sprintf('diff.%s.%s', $invert ? 'ago' : 'in', $unit); /** @Ignore */ - return $this->translator->trans($id, ['%count%' => $count], 'time_diff'); + return $this->translator->trans($id, ['%count%' => $count], 'ibexa_time_diff'); } private function getEmptyDiffMessage(): string @@ -67,7 +69,7 @@ private function getEmptyDiffMessage(): string /** @Desc("now") */ 'diff.empty', [], - 'time_diff' + 'ibexa_time_diff' ); } @@ -77,18 +79,18 @@ private function getEmptyDiffMessage(): string public static function getTranslationMessages(): array { return [ - (new Message('diff.ago.year', 'time_diff'))->setDesc('1 year ago|%count% years ago'), - (new Message('diff.ago.month', 'time_diff'))->setDesc('1 month ago|%count% months ago'), - (new Message('diff.ago.day', 'time_diff'))->setDesc('1 day ago|%count% days ago'), - (new Message('diff.ago.hour', 'time_diff'))->setDesc('1 hour ago|%count% hours ago'), - (new Message('diff.ago.minute', 'time_diff'))->setDesc('1 minute ago|%count% minutes ago'), - (new Message('diff.ago.second', 'time_diff'))->setDesc('1 second ago|%count% seconds ago'), - (new Message('diff.in.year', 'time_diff'))->setDesc('in 1 second|in %count% seconds'), - (new Message('diff.in.month', 'time_diff'))->setDesc('in 1 hour|in %count% hours'), - (new Message('diff.in.day', 'time_diff'))->setDesc('in 1 minute|in %count% minutes'), - (new Message('diff.in.hour', 'time_diff'))->setDesc('in 1 day|in %count% days'), - (new Message('diff.in.minute', 'time_diff'))->setDesc('in 1 month|in %count% months'), - (new Message('diff.in.second', 'time_diff'))->setDesc('in 1 year|in %count% years'), + (new Message('diff.ago.year', 'ibexa_time_diff'))->setDesc('1 year ago|%count% years ago'), + (new Message('diff.ago.month', 'ibexa_time_diff'))->setDesc('1 month ago|%count% months ago'), + (new Message('diff.ago.day', 'ibexa_time_diff'))->setDesc('1 day ago|%count% days ago'), + (new Message('diff.ago.hour', 'ibexa_time_diff'))->setDesc('1 hour ago|%count% hours ago'), + (new Message('diff.ago.minute', 'ibexa_time_diff'))->setDesc('1 minute ago|%count% minutes ago'), + (new Message('diff.ago.second', 'ibexa_time_diff'))->setDesc('1 second ago|%count% seconds ago'), + (new Message('diff.in.year', 'ibexa_time_diff'))->setDesc('in 1 second|in %count% seconds'), + (new Message('diff.in.month', 'ibexa_time_diff'))->setDesc('in 1 hour|in %count% hours'), + (new Message('diff.in.day', 'ibexa_time_diff'))->setDesc('in 1 minute|in %count% minutes'), + (new Message('diff.in.hour', 'ibexa_time_diff'))->setDesc('in 1 day|in %count% days'), + (new Message('diff.in.minute', 'ibexa_time_diff'))->setDesc('in 1 month|in %count% months'), + (new Message('diff.in.second', 'ibexa_time_diff'))->setDesc('in 1 year|in %count% years'), ]; } } diff --git a/src/lib/UserSetting/Autosave.php b/src/lib/UserSetting/Autosave.php index 7809d842de..060bee38cf 100644 --- a/src/lib/UserSetting/Autosave.php +++ b/src/lib/UserSetting/Autosave.php @@ -93,7 +93,7 @@ private function getTranslatedName(): string /** @Desc("Autosave draft") */ 'settings.autosave.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -103,7 +103,7 @@ private function getTranslatedDescription(): string /** @Desc("Autosave draft every given period") */ 'settings.autosave.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -113,7 +113,7 @@ private function getTranslatedOptionEnabled(): string /** @Desc("enabled") */ 'settings.autosave.value.enabled', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -123,7 +123,7 @@ private function getTranslatedOptionDisabled(): string /** @Desc("disabled") */ 'settings.autosave.value.disabled', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/AutosaveInterval.php b/src/lib/UserSetting/AutosaveInterval.php index a77e9ec303..6b9412284a 100644 --- a/src/lib/UserSetting/AutosaveInterval.php +++ b/src/lib/UserSetting/AutosaveInterval.php @@ -73,7 +73,7 @@ private function getTranslatedName(): string /** @Desc("Autosave interval") */ 'settings.autosave_interval.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -83,7 +83,7 @@ private function getTranslatedDescription(): string /** @Desc("Seconds till next draft autosave") */ 'settings.autosave_interval.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/src/lib/UserSetting/InContextTranslation.php b/src/lib/UserSetting/InContextTranslation.php index 6676debadd..8e36b9a722 100644 --- a/src/lib/UserSetting/InContextTranslation.php +++ b/src/lib/UserSetting/InContextTranslation.php @@ -86,7 +86,7 @@ private function getTranslatedName(): string /** @Desc("In-Context translation") */ 'settings.in_context_translation.value.title', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -96,7 +96,7 @@ private function getTranslatedDescription(): string /** @Desc("Toggle In-Context translation feature") */ 'settings.in_context_translation.value.description', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -106,7 +106,7 @@ private function getTranslatedOptionEnabled(): string /** @Desc("enabled") */ 'settings.in_context_translation.value.enabled', [], - 'user_settings' + 'ibexa_user_settings' ); } @@ -116,7 +116,7 @@ private function getTranslatedOptionDisabled(): string /** @Desc("disabled") */ 'settings.in_context_translation.value.disabled', [], - 'user_settings' + 'ibexa_user_settings' ); } } diff --git a/tests/lib/Translation/Extractor/LimitationTranslationExtractorTest.php b/tests/lib/Translation/Extractor/LimitationTranslationExtractorTest.php index 7aac098e32..aae8f6b83c 100644 --- a/tests/lib/Translation/Extractor/LimitationTranslationExtractorTest.php +++ b/tests/lib/Translation/Extractor/LimitationTranslationExtractorTest.php @@ -47,7 +47,7 @@ private function getExpectedMessageCatalogue(): MessageCatalogue $id = "policy.limitation.identifier.limitation{$i}"; $translated = "Limitation{$i}"; - $message = new Message\XliffMessage($id, 'ezplatform_content_forms_policies'); + $message = new Message\XliffMessage($id, 'ibexa_content_forms_policies'); $message->setNew(false); $message->setMeaning($translated); $message->setDesc($translated);