Skip to content

Commit

Permalink
IBX-6415: Renamed domain names (#886)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikadamczyk authored Sep 5, 2023
1 parent f23997b commit f3fe165
Show file tree
Hide file tree
Showing 433 changed files with 1,042 additions and 967 deletions.
3 changes: 2 additions & 1 deletion src/bundle/Controller/AssetController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
15 changes: 8 additions & 7 deletions src/bundle/Controller/ContentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'
);
}

Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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'
);
}

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

Expand All @@ -479,7 +480,7 @@ public function updateVisibilityAction(Request $request): Response
/** @Desc("Content item '%name%' hidden.") */
'content.hide.success',
['%name%' => $contentName],
'content'
'ibexa_content'
);
}

Expand All @@ -490,7 +491,7 @@ public function updateVisibilityAction(Request $request): Response
/** @Desc("Content item '%name%' revealed.") */
'content.reveal.success',
['%name%' => $contentName],
'content'
'ibexa_content'
);
}

Expand Down
21 changes: 11 additions & 10 deletions src/bundle/Controller/ContentTypeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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'
)
);

Expand Down Expand Up @@ -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'
);
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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'
);
});

Expand Down Expand Up @@ -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'
);
}
});
Expand Down Expand Up @@ -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'
);
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/bundle/Controller/ContentTypeGroupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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', [
Expand Down Expand Up @@ -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'
);
});

Expand Down Expand Up @@ -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'
);
}
});
Expand Down
9 changes: 5 additions & 4 deletions src/bundle/Controller/LanguageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'
);
});

Expand Down Expand Up @@ -180,7 +181,7 @@ public function bulkDeleteAction(Request $request): Response
/** @Desc("Language '%name%' removed.") */
'language.delete.success',
['%name%' => $language->name],
'language'
'ibexa_language'
);
}
});
Expand All @@ -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', [
Expand Down Expand Up @@ -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', [
Expand Down
3 changes: 2 additions & 1 deletion src/bundle/Controller/LinkManagerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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');
Expand Down
Loading

0 comments on commit f3fe165

Please sign in to comment.