Skip to content

Commit f3fe165

Browse files
mikadamczykmikadamczyk
authored
IBX-6415: Renamed domain names (#886)
1 parent f23997b commit f3fe165

File tree

433 files changed

+1042
-967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

433 files changed

+1042
-967
lines changed

‎src/bundle/Controller/AssetController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Ibexa\Contracts\AdminUi\Controller\Controller;
1414
use Ibexa\Core\FieldType\Image\Value as ImageValue;
1515
use Ibexa\Core\FieldType\ImageAsset\AssetMapper as ImageAssetMapper;
16+
use JMS\TranslationBundle\Annotation\Desc;
1617
use Symfony\Component\HttpFoundation\JsonResponse;
1718
use Symfony\Component\HttpFoundation\Request;
1819
use Symfony\Component\HttpFoundation\Response;
@@ -118,7 +119,7 @@ private function createInvalidCsrfResponse(): JsonResponse
118119
/** @Desc("Missing or invalid CSRF token") */
119120
'asset.upload.invalid_csrf',
120121
[],
121-
'assets'
122+
'ibexa_admin_ui'
122123
);
123124

124125
return $this->createGenericErrorResponse($errorMessage);

‎src/bundle/Controller/Content/VersionDraftConflictController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
1717
use Ibexa\Contracts\Core\Repository\LocationService;
1818
use Ibexa\Contracts\Core\Repository\UserService;
19+
use JMS\TranslationBundle\Annotation\Desc;
1920
use Symfony\Component\HttpFoundation\Response;
2021
use Symfony\Contracts\Translation\TranslatorInterface;
2122

@@ -83,7 +84,7 @@ public function draftHasNoConflictAction(
8384
/** @Desc("Cannot check if the draft has conflicts with other drafts. %error%.") */
8485
'content.draft.conflict.error',
8586
['%error%' => $e->getMessage()],
86-
'content'
87+
'ibexa_content'
8788
);
8889

8990
return new Response($error, Response::HTTP_FORBIDDEN);

‎src/bundle/Controller/ContentController.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
4040
use Ibexa\Core\Base\Exceptions\BadStateException;
4141
use Ibexa\Core\Helper\TranslationHelper;
42+
use JMS\TranslationBundle\Annotation\Desc;
4243
use Symfony\Component\HttpFoundation\JsonResponse;
4344
use Symfony\Component\HttpFoundation\RedirectResponse;
4445
use Symfony\Component\HttpFoundation\Request;
@@ -242,7 +243,7 @@ public function editAction(Request $request): Response
242243
/** @Desc("Created a new draft for '%name%'.") */
243244
'content.create_draft.success',
244245
['%name%' => $this->translationHelper->getTranslatedContentName($content)],
245-
'content'
246+
'ibexa_content'
246247
);
247248
}
248249

@@ -304,7 +305,7 @@ public function updateMainLocationAction(Request $request): Response
304305
/** @Desc("Main Location for '%name%' updated.") */
305306
'content.main_location_update.success',
306307
['%name%' => $contentInfo->name],
307-
'content'
308+
'ibexa_content'
308309
);
309310

310311
return new RedirectResponse($this->generateUrl('ibexa.content.view', [
@@ -408,7 +409,7 @@ public function updateMainTranslationAction(Request $request): Response
408409
/** @Desc("Main language for '%name%' updated.") */
409410
'content.main_language_update.success',
410411
['%name%' => $this->translationHelper->getTranslatedContentName($content)],
411-
'content'
412+
'ibexa_content'
412413
);
413414

414415
return new RedirectResponse($this->generateUrl('ibexa.content.view', [
@@ -459,7 +460,7 @@ public function updateVisibilityAction(Request $request): Response
459460
/** @Desc("Content item '%name%' is already hidden.") */
460461
'content.hide.already_hidden',
461462
['%name%' => $contentName],
462-
'content'
463+
'ibexa_content'
463464
);
464465
}
465466

@@ -468,7 +469,7 @@ public function updateVisibilityAction(Request $request): Response
468469
/** @Desc("Content item '%name%' is already visible.") */
469470
'content.reveal.already_visible',
470471
['%name%' => $contentName],
471-
'content'
472+
'ibexa_content'
472473
);
473474
}
474475

@@ -479,7 +480,7 @@ public function updateVisibilityAction(Request $request): Response
479480
/** @Desc("Content item '%name%' hidden.") */
480481
'content.hide.success',
481482
['%name%' => $contentName],
482-
'content'
483+
'ibexa_content'
483484
);
484485
}
485486

@@ -490,7 +491,7 @@ public function updateVisibilityAction(Request $request): Response
490491
/** @Desc("Content item '%name%' revealed.") */
491492
'content.reveal.success',
492493
['%name%' => $contentName],
493-
'content'
494+
'ibexa_content'
494495
);
495496
}
496497

‎src/bundle/Controller/ContentTypeController.php‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup;
3939
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
4040
use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
41+
use JMS\TranslationBundle\Annotation\Desc;
4142
use Pagerfanta\Adapter\ArrayAdapter;
4243
use Pagerfanta\Pagerfanta;
4344
use Symfony\Component\Form\FormInterface;
@@ -208,7 +209,7 @@ public function addAction(ContentTypeGroup $group)
208209
/** @Desc("Cannot create Content Type. Could not find language with identifier '%languageCode%'") */
209210
'content_type.add.missing_language',
210211
['%languageCode%' => $mainLanguageCode],
211-
'content_type'
212+
'ibexa_content_type'
212213
);
213214

214215
return $this->redirectToRoute('ibexa.content_type_group.view', [
@@ -258,7 +259,7 @@ public function addTranslationAction(Request $request): Response
258259
/** @Desc("Draft of Content Type '%name%' already exists and is locked by '%userContentName%'") */
259260
'content_type.edit.error.already_exists',
260261
['%name%' => $contentType->getName(), '%userContentName%' => $this->getUserNameById($userId)],
261-
'content_type'
262+
'ibexa_content_type'
262263
);
263264

264265
return $this->redirectToRoute('ibexa.content_type.view', [
@@ -316,7 +317,7 @@ public function removeTranslationAction(Request $request): Response
316317
/** @Desc("Draft of Content Type '%name%' already exists and is locked by '%userContentName%'") */
317318
'content_type.edit.error.already_exists',
318319
['%name%' => $contentType->getName(), '%userContentName%' => $this->getUserNameById($userId)],
319-
'content_type'
320+
'ibexa_content_type'
320321
);
321322

322323
return $this->redirectToRoute('ibexa.content_type.view', [
@@ -371,7 +372,7 @@ public function editAction(Request $request, ContentTypeGroup $group, ContentTyp
371372
/** @Desc("Draft of Content Type '%name%' already exists and is locked by '%userContentName%'") */
372373
'content_type.edit.error.already_exists',
373374
['%name%' => $contentType->getName(), '%userContentName%' => $this->getUserNameById($contentTypeDraft->modifierId)],
374-
'content_type'
375+
'ibexa_content_type'
375376
)
376377
);
377378

@@ -444,14 +445,14 @@ public function copyAction(Request $request, ContentTypeGroup $group, ContentTyp
444445
/** @Desc("Content Type '%name%' copied.") */
445446
'content_type.copy.success',
446447
['%name%' => $contentType->getName()],
447-
'content_type'
448+
'ibexa_content_type'
448449
);
449450
} catch (UnauthorizedException $exception) {
450451
$notificationHandler->error(
451452
/** @Desc("Content Type '%name%' cannot be copied.") */
452453
'content_type.copy.error',
453454
['%name%' => $contentType->getName()],
454-
'content_type'
455+
'ibexa_content_type'
455456
);
456457
}
457458

@@ -519,7 +520,7 @@ public function updateAction(
519520
/** @Desc("Content Type '%name%' updated.") */
520521
'content_type.update.success',
521522
['%name%' => $contentTypeDraft->getName()],
522-
'content_type'
523+
'ibexa_content_type'
523524
);
524525

525526
if ($action === self::PRIMARY_UPDATE_ACTION) {
@@ -620,7 +621,7 @@ public function deleteAction(Request $request, ContentTypeGroup $group, ContentT
620621
/** @Desc("Content Type '%name%' deleted.") */
621622
'content_type.delete.success',
622623
['%name%' => $contentType->getName()],
623-
'content_type'
624+
'ibexa_content_type'
624625
);
625626
});
626627

@@ -665,7 +666,7 @@ public function bulkDeleteAction(Request $request, ContentTypeGroup $group): Res
665666
/** @Desc("Content Type '%name%' deleted.") */
666667
'content_type.delete.success',
667668
['%name%' => $contentType->getName()],
668-
'content_type'
669+
'ibexa_content_type'
669670
);
670671
}
671672
});
@@ -804,7 +805,7 @@ private function getUserNameById(int $userId): ?string
804805
/** @Desc("another user") */
805806
'content_type.user_name.can_not_be_fetched',
806807
[],
807-
'content_type'
808+
'ibexa_content_type'
808809
);
809810
}
810811
}

‎src/bundle/Controller/ContentTypeGroupController.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup;
2121
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
2222
use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
23+
use JMS\TranslationBundle\Annotation\Desc;
2324
use Pagerfanta\Adapter\ArrayAdapter;
2425
use Pagerfanta\Pagerfanta;
2526
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -124,7 +125,7 @@ public function createAction(Request $request): Response
124125
/** @Desc("Created Content Type group '%name%'.") */
125126
'content_type_group.create.success',
126127
['%name%' => $data->getIdentifier()],
127-
'content_type'
128+
'ibexa_content_type'
128129
);
129130

130131
return new RedirectResponse($this->generateUrl('ibexa.content_type_group.view', [
@@ -168,7 +169,7 @@ public function updateAction(Request $request, ContentTypeGroup $group): Respons
168169
/** @Desc("Updated Content Type group '%name%'.") */
169170
'content_type_group.update.success',
170171
['%name%' => $group->identifier],
171-
'content_type'
172+
'ibexa_content_type'
172173
);
173174

174175
return new RedirectResponse($this->generateUrl('ibexa.content_type_group.view', [
@@ -210,7 +211,7 @@ public function deleteAction(Request $request, ContentTypeGroup $group): Respons
210211
/** @Desc("Deleted Content Type group '%name%'.") */
211212
'content_type_group.delete.success',
212213
['%name%' => $group->identifier],
213-
'content_type'
214+
'ibexa_content_type'
214215
);
215216
});
216217

@@ -247,7 +248,7 @@ public function bulkDeleteAction(Request $request): Response
247248
/** @Desc("Deleted Content Type group '%name%'.") */
248249
'content_type_group.delete.success',
249250
['%name%' => $group->identifier],
250-
'content_type'
251+
'ibexa_content_type'
251252
);
252253
}
253254
});

‎src/bundle/Controller/LanguageController.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Ibexa\Contracts\Core\Repository\Values\Content\Language;
2020
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
2121
use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
22+
use JMS\TranslationBundle\Annotation\Desc;
2223
use Pagerfanta\Adapter\ArrayAdapter;
2324
use Pagerfanta\Pagerfanta;
2425
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -137,7 +138,7 @@ public function deleteAction(Request $request, Language $language): Response
137138
/** @Desc("Language '%name%' removed.") */
138139
'language.delete.success',
139140
['%name%' => $language->name],
140-
'language'
141+
'ibexa_language'
141142
);
142143
});
143144

@@ -180,7 +181,7 @@ public function bulkDeleteAction(Request $request): Response
180181
/** @Desc("Language '%name%' removed.") */
181182
'language.delete.success',
182183
['%name%' => $language->name],
183-
'language'
184+
'ibexa_language'
184185
);
185186
}
186187
});
@@ -207,7 +208,7 @@ public function createAction(Request $request): Response
207208
/** @Desc("Language '%name%' created.") */
208209
'language.create.success',
209210
['%name%' => $language->name],
210-
'language'
211+
'ibexa_language'
211212
);
212213

213214
return new RedirectResponse($this->generateUrl('ibexa.language.view', [
@@ -245,7 +246,7 @@ public function editAction(Request $request, Language $language): Response
245246
/** @Desc("Language '%name%' updated.") */
246247
'language.update.success',
247248
['%name%' => $language->name],
248-
'language'
249+
'ibexa_language'
249250
);
250251

251252
return new RedirectResponse($this->generateUrl('ibexa.language.view', [

‎src/bundle/Controller/LinkManagerController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface;
1616
use Ibexa\Contracts\Core\Repository\URLService;
1717
use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
18+
use JMS\TranslationBundle\Annotation\Desc;
1819
use Pagerfanta\Pagerfanta;
1920
use Symfony\Component\HttpFoundation\Request;
2021
use Symfony\Component\HttpFoundation\Response;
@@ -80,7 +81,7 @@ public function editAction(Request $request, int $urlId): Response
8081
/** @Desc("URL updated") */
8182
'url.update.success',
8283
[],
83-
'linkmanager'
84+
'ibexa_linkmanager'
8485
);
8586

8687
return $this->redirectToRoute('ibexa.url_management');

0 commit comments

Comments
 (0)