Skip to content

Commit 5725b91

Browse files
mikadamczykmikadamczyk
committed
Renamed domain names - part1
1 parent 4313837 commit 5725b91

File tree

170 files changed

+394
-372
lines changed

Some content is hidden

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

170 files changed

+394
-372
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;
@@ -206,7 +207,7 @@ public function addAction(ContentTypeGroup $group)
206207
/** @Desc("Cannot create Content Type. Could not find language with identifier '%languageCode%'") */
207208
'content_type.add.missing_language',
208209
['%languageCode%' => $mainLanguageCode],
209-
'content_type'
210+
'ibexa_content_type'
210211
);
211212

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

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

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

@@ -442,14 +443,14 @@ public function copyAction(Request $request, ContentTypeGroup $group, ContentTyp
442443
/** @Desc("Content Type '%name%' copied.") */
443444
'content_type.copy.success',
444445
['%name%' => $contentType->getName()],
445-
'content_type'
446+
'ibexa_content_type'
446447
);
447448
} catch (UnauthorizedException $exception) {
448449
$notificationHandler->error(
449450
/** @Desc("Content Type '%name%' cannot be copied.") */
450451
'content_type.copy.error',
451452
['%name%' => $contentType->getName()],
452-
'content_type'
453+
'ibexa_content_type'
453454
);
454455
}
455456

@@ -516,7 +517,7 @@ public function updateAction(
516517
/** @Desc("Content Type '%name%' updated.") */
517518
'content_type.update.success',
518519
['%name%' => $contentTypeDraft->getName()],
519-
'content_type'
520+
'ibexa_content_type'
520521
);
521522

522523
if ('publishContentType' === $form->getClickedButton()->getName()) {
@@ -617,7 +618,7 @@ public function deleteAction(Request $request, ContentTypeGroup $group, ContentT
617618
/** @Desc("Content Type '%name%' deleted.") */
618619
'content_type.delete.success',
619620
['%name%' => $contentType->getName()],
620-
'content_type'
621+
'ibexa_content_type'
621622
);
622623
});
623624

@@ -662,7 +663,7 @@ public function bulkDeleteAction(Request $request, ContentTypeGroup $group): Res
662663
/** @Desc("Content Type '%name%' deleted.") */
663664
'content_type.delete.success',
664665
['%name%' => $contentType->getName()],
665-
'content_type'
666+
'ibexa_content_type'
666667
);
667668
}
668669
});
@@ -801,7 +802,7 @@ private function getUserNameById(int $userId): ?string
801802
/** @Desc("another user") */
802803
'content_type.user_name.can_not_be_fetched',
803804
[],
804-
'content_type'
805+
'ibexa_content_type'
805806
);
806807
}
807808
}

‎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/User/UserDeleteController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface;
1414
use Ibexa\Contracts\Core\Repository\LocationService;
1515
use Ibexa\Contracts\Core\Repository\UserService;
16+
use JMS\TranslationBundle\Annotation\Desc;
1617
use Symfony\Component\HttpFoundation\RedirectResponse;
1718
use Symfony\Component\HttpFoundation\Request;
1819
use Symfony\Component\HttpFoundation\Response;
@@ -86,7 +87,7 @@ public function userDeleteAction(Request $request): Response
8687
/** @Desc("User with login '%login%' deleted.") */
8788
'user.delete.success',
8889
['%login%' => $user->login],
89-
'content'
90+
'ibexa_content'
9091
);
9192

9293
return new RedirectResponse($this->generateUrl('ibexa.content.view', [

‎src/bundle/Resources/config/bazinga_js_translation.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ active_domains:
77
- 'content'
88
- 'multi_file_upload'
99
- 'sub_items'
10-
- 'content_tree'
10+
- 'ibexa_content_tree'
1111
- 'trash_ui'
1212
- 'user_invitation'
13-
- 'content_type'
13+
- 'ibexa_content_type'
1414
- 'messages'

‎src/bundle/Resources/public/js/scripts/admin.content.edit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
const saveMessage = Translator.trans(
162162
/*@Desc("Draft saved %time%")*/ 'content_edit.autosave.status_saved.message.full',
163163
{ time: saveTime },
164-
'content',
164+
'ibexa_content',
165165
);
166166

167167
autosaveStatusSavedNode.innerHTML = saveMessage;

‎src/bundle/Resources/public/js/scripts/admin.contenttype.edit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
const noFieldsAddedError = Translator.trans(
1818
/*@Desc("You have to add at least one field definition")*/ 'content_type.edit.error.no_added_fields_definition',
1919
{},
20-
'content_type',
20+
'ibexa_content_type',
2121
);
2222
const endpoints = {
2323
add: {

‎src/bundle/Resources/public/js/scripts/admin.location.view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
const errorMessage = Translator.trans(
5252
/*@Desc("You don't have permission to edit this Content item")*/ 'content.edit.permission.error',
5353
{},
54-
'content',
54+
'ibexa_content',
5555
);
5656
const handleCanEditCheck = (response) => {
5757
if (response.canEdit) {

0 commit comments

Comments
 (0)