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 @@
-
-
{{ '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 %}