From a78fe5961590713ebdea895775484bb7a88a4fed Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 7 Aug 2023 15:09:17 +0200 Subject: [PATCH 01/21] IBX-6314: initial --- features/personas/SubtreeEditor.feature | 4 ++-- .../themes/admin/account/bookmarks/toggle_switch.html.twig | 2 +- .../admin/content/modal/user_group_invitation_modal.html.twig | 2 +- .../views/themes/admin/content/tab/details.html.twig | 2 +- .../views/themes/admin/content/tab/locations/tab.html.twig | 2 +- .../themes/admin/ui/field_type/edit/relation_base.html.twig | 2 +- src/bundle/Resources/views/themes/admin/ui/layout.html.twig | 2 +- .../themes/admin/user/invitation/issue_email_empty.html.twig | 2 +- .../views/themes/admin/user/role_assignment/create.html.twig | 2 +- src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js | 2 +- src/lib/Behat/Page/ContentViewPage.php | 2 +- src/lib/Form/Type/Content/CustomUrl/CustomUrlAddType.php | 1 + src/lib/Form/Type/Location/LocationAssignSectionType.php | 2 +- src/lib/Form/Type/Location/LocationTrashType.php | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/features/personas/SubtreeEditor.feature b/features/personas/SubtreeEditor.feature index fe2a6cb612..605955910c 100644 --- a/features/personas/SubtreeEditor.feature +++ b/features/personas/SubtreeEditor.feature @@ -61,7 +61,7 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task | buttonName | | Create content | | Edit | - And the "Send to Trash" button is not visible + And the "Delete" button is not visible Scenario: I cannot edit, create or send to trash Content outside my permissions Given I navigate to content "FolderGrandParent" of type "DedicatedFolder" in "root" @@ -69,4 +69,4 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task | buttonName | | Create content | | Edit | - And the "Send to Trash" button is not visible + And the "Delete" button is not visible diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig index d433a6b718..5ba6be149c 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/toggle_switch.html.twig @@ -4,7 +4,7 @@
{% if content is defined %} - {{ 'content.create.editing_details'|trans({ '%content_name%': ibexa_content_name(content) })|desc('under %content_name%') }} + {{ 'content.create.editing_details'|trans({ '%content%': ibexa_content_name(content) })|desc('Location: %content%') }} {% endif %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig index c055befc4e..673ef67f61 100644 --- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig @@ -452,7 +452,7 @@ {% block content_type_field_definition_widget -%} {{- form_row(form.enabled, { label: 'meta.enabled'|trans({ '%type%': form.name.vars.value, - }, 'content_type')|desc('Enable %type% for this content type') }) -}} + }, 'content_type')|desc('Enable %type% for this Content Type') }) -}} {% for form_field in form.children %} {% if form_field.isRendered() == false %} diff --git a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig index 1f527cde03..0df6b2ec9c 100644 --- a/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig @@ -35,7 +35,7 @@ content_type_name: content_type.name, show_autosave_status: true, description: content_type.description, - subtitle: 'editing_details'|trans({ '%location_name%': parent_location.contentInfo.name, '%language%': language.name })|desc('under %location_name% in %language%'), + subtitle: 'editing_details'|trans({ '%location%': parent_location.contentInfo.name, '%language%': language.name })|desc('Location: %location% Translation: %language'), context_actions: context_actions, } %} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/create.html.twig b/src/bundle/Resources/views/themes/admin/user/create.html.twig index 432cd69c36..c06056add8 100644 --- a/src/bundle/Resources/views/themes/admin/user/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/create.html.twig @@ -17,7 +17,7 @@ icon_name: content_type.name, show_autosave_status: false, title: 'new_content_item'|trans({'%contentType%': content_type.name})|desc('New %contentType%'), - subtitle: 'editing_details'|trans({ '%location_name%': parent_location.contentInfo.name })|desc('under %location_name%'), + subtitle: 'editing_details'|trans({ '%location%': parent_location.contentInfo.name })|desc('Location: %location%'), context_actions: knp_menu_render(user_content_edit_menu, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'}) } %} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/edit.html.twig index 737e495910..121f0f6edd 100644 --- a/src/bundle/Resources/views/themes/admin/user/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/edit.html.twig @@ -18,7 +18,7 @@ icon_name: content_type.name, show_autosave_status: false, title: "%s %s"|format(user.getFieldValue('first_name'), user.getFieldValue('last_name')), - subtitle: 'editing_details'|trans({ '%location_name%': parent_location.contentInfo.name })|desc('under %location_name%'), + subtitle: 'editing_details'|trans({ '%location%': parent_location.contentInfo.name })|desc('Location: %location%'), context_actions: knp_menu_render(user_content_edit_menu, {'template': '@ibexadesign/ui/menu/context_menu.html.twig'}) } %} {% endblock %} diff --git a/src/bundle/ui-dev/src/modules/common/services/content.type.service.js b/src/bundle/ui-dev/src/modules/common/services/content.type.service.js index c5e9504af0..9657737b39 100644 --- a/src/bundle/ui-dev/src/modules/common/services/content.type.service.js +++ b/src/bundle/ui-dev/src/modules/common/services/content.type.service.js @@ -11,5 +11,5 @@ export const loadContentTypes = (contentTypeIds, callback) => { fetch(request) .then(handleRequestResponse) .then(callback) - .catch(() => window.ibexa.helpers.notification.showErrorNotification('Cannot load content types')); + .catch(() => window.ibexa.helpers.notification.showErrorNotification('Cannot load Content Types')); }; diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/services/multi.file.upload.service.js b/src/bundle/ui-dev/src/modules/multi-file-upload/services/multi.file.upload.service.js index 44c50cdaaf..d1ff758391 100644 --- a/src/bundle/ui-dev/src/modules/multi-file-upload/services/multi.file.upload.service.js +++ b/src/bundle/ui-dev/src/modules/multi-file-upload/services/multi.file.upload.service.js @@ -169,7 +169,7 @@ const prepareStruct = ({ parentInfo, config, languageCode }, data) => { .catch(() => window.ibexa.helpers.notification.showErrorNotification( Translator.trans( - /*@Desc("Cannot get content type by identifier")*/ 'cannot_get_content_type_identifier.message', + /*@Desc("Cannot get Content Type by identifier")*/ 'cannot_get_content_type_identifier.message', {}, 'multi_file_upload', ), @@ -189,7 +189,7 @@ const prepareStruct = ({ parentInfo, config, languageCode }, data) => { .catch(() => window.ibexa.helpers.notification.showErrorNotification( Translator.trans( - /*@Desc("Cannot get content type by identifier")*/ 'cannot_get_content_type_identifier.message', + /*@Desc("Cannot get Content Type by identifier")*/ 'cannot_get_content_type_identifier.message', {}, 'multi_file_upload', ), diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js index 923934e275..7101220c8a 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js @@ -87,8 +87,8 @@ const ContentCreateWidget = () => { 'universal_discovery_widget', ); const createUnderLabel = Translator.trans( - /*@Desc("under %content_name%")*/ 'content.create.editing_details', - { content_name: selectedLocation?.location?.ContentInfo.Content.TranslatedName }, + /*@Desc("Location: %location%")*/ 'content.create.editing_details', + { location: selectedLocation?.location?.ContentInfo.Content.TranslatedName }, 'universal_discovery_widget', ); const widgetClassName = createCssClassNames({ diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js index 5afe9b40ad..4c432ba1e8 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/content.meta.preview.module.js @@ -30,7 +30,7 @@ const ContentMetaPreview = () => { const allowRedirects = useContext(AllowRedirectsContext); const { formatShortDateTime } = ibexa.helpers.timezone; const locationData = useMemo(() => getLocationData(loadedLocationsMap, markedLocationId), [markedLocationId, loadedLocationsMap]); - const lastModifiedLabel = Translator.trans(/*@Desc("Last modified")*/ 'meta_preview.last_modified', {}, 'universal_discovery_widget'); + const lastModifiedLabel = Translator.trans(/*@Desc("Modified")*/ 'meta_preview.last_modified', {}, 'universal_discovery_widget'); const creationDateLabel = Translator.trans(/*@Desc("Created")*/ 'meta_preview.creation_date', {}, 'universal_discovery_widget'); const translationsLabel = Translator.trans(/*@Desc("Translations")*/ 'meta_preview.translations', {}, 'universal_discovery_widget'); diff --git a/src/lib/Form/TrashLocationOptionProvider/HasChildren.php b/src/lib/Form/TrashLocationOptionProvider/HasChildren.php index 0f8fc8e70b..fee9fe66d2 100644 --- a/src/lib/Form/TrashLocationOptionProvider/HasChildren.php +++ b/src/lib/Form/TrashLocationOptionProvider/HasChildren.php @@ -40,7 +40,7 @@ public function addOptions(FormInterface $form, Location $location): void $translatorParameters = [ '%children_count%' => $childCount, - '%content_name%' => $location->getContent()->getName(), + '%content%' => $location->getContent()->getName(), ]; $form @@ -49,7 +49,7 @@ public function addOptions(FormInterface $form, Location $location): void /** @Desc("Sub-items") */ $this->translator->trans('form.has_children.label', [], 'forms'), 'help_multiline' => [ - /** @Desc("Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.") */ + /** @Desc("Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.") */ $this->translator->trans('trash_container.modal.message_main', $translatorParameters, 'messages'), ], ]); diff --git a/src/lib/Form/TrashLocationOptionProvider/HasReverseRelations.php b/src/lib/Form/TrashLocationOptionProvider/HasReverseRelations.php index de28bb97be..bf4f4f1d0a 100644 --- a/src/lib/Form/TrashLocationOptionProvider/HasReverseRelations.php +++ b/src/lib/Form/TrashLocationOptionProvider/HasReverseRelations.php @@ -42,7 +42,7 @@ public function addOptions(FormInterface $form, Location $location): void $reverseRelationsCount = $this->contentService->countReverseRelations($location->contentInfo); $translatorParameters = [ - '%content_name%' => $location->getContent()->getName(), + '%content%' => $location->getContent()->getName(), '%reverse_relations%' => $reverseRelationsCount, ]; @@ -52,7 +52,7 @@ public function addOptions(FormInterface $form, Location $location): void /** @Desc("Conflict with reverse Relations") */ $this->translator->trans('form.has_reverse_relation.label', [], 'forms'), 'help_multiline' => [ - /** @Desc("'%content_name%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item.") */ + /** @Desc("'%content%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item.") */ $this->translator->trans('trash_container.modal.message_relations', $translatorParameters), ], ]); diff --git a/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php b/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php index 7ea587948d..88548aeef1 100644 --- a/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php +++ b/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php @@ -46,7 +46,7 @@ public function supports(Location $location): bool public function addOptions(FormInterface $form, Location $location): void { $translatorParameters = [ - '%content_name%' => $location->getContent()->getName(), + '%content%' => $location->getContent()->getName(), ]; $form->add(self::TRASH_ASSETS, ChoiceType::class, [ @@ -62,7 +62,7 @@ public function addOptions(FormInterface $form, Location $location): void $this->translator->trans('location_trash_form.trash_with_asset', $translatorParameters, 'forms') => self::RADIO_SELECT_TRASH_WITH_ASSETS, ], 'help_multiline' => [ - /** @Desc("'%content_name%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option:") */ + /** @Desc("'%content%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option:") */ $this->translator->trans('trash_asset_single.modal.message_main', $translatorParameters), ], ]); From a130233278d1fbbac73781ac1bced8df0cf8bdaa Mon Sep 17 00:00:00 2001 From: tischsoic Date: Tue, 8 Aug 2023 10:53:08 +0200 Subject: [PATCH 08/21] FT: add new -> add --- .../views/themes/admin/content/modal/draft_conflict.html.twig | 2 +- .../views/themes/admin/content/tab/locations/tab.html.twig | 2 +- .../views/themes/admin/content/tab/translations/tab.html.twig | 2 +- .../Resources/views/themes/admin/content/tab/urls.html.twig | 2 +- .../Resources/views/themes/admin/object_state/list.html.twig | 2 +- .../Resources/views/themes/admin/url_wildcard/list.html.twig | 2 +- .../Resources/views/themes/admin/user/policy/list.html.twig | 2 +- src/lib/Behat/Page/RolePage.php | 2 +- src/lib/Menu/ContentRightSidebarBuilder.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig index 58d8bd9f84..f1c48164e8 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/draft_conflict.html.twig @@ -51,7 +51,7 @@ - {{ 'draft.conflict.add_new'|trans|desc('Add new') }} + {{ 'draft.conflict.add_new'|trans|desc('Add') }} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig index d4976c6e62..ffa5f58557 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig @@ -158,7 +158,7 @@ - {{ 'tab.locations.action.add'|trans|desc('Add new') }} + {{ 'tab.locations.action.add'|trans|desc('Add') }} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig index 384b85e980..f2af855485 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig @@ -94,7 +94,7 @@ - {{ 'tab.translations.action.add'|trans|desc('Add new') }} + {{ 'tab.translations.action.add'|trans|desc('Add') }} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig index e3351dfb8e..d737d166e7 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig @@ -58,7 +58,7 @@ - {{ 'tab.urls.action.add'|trans|desc('Add new') }} + {{ 'tab.urls.action.add'|trans|desc('Add') }} diff --git a/src/bundle/Resources/views/themes/admin/object_state/list.html.twig b/src/bundle/Resources/views/themes/admin/object_state/list.html.twig index 743611eb61..a161dc4dfb 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/list.html.twig @@ -83,7 +83,7 @@ - {{ 'object_state.new'|trans|desc('Add new') }} + {{ 'object_state.new'|trans|desc('Add') }} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig index 7024b16cb9..bcd0422ef5 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/list.html.twig @@ -122,7 +122,7 @@ - {{ 'url_wildcard.list.action.create'|trans|desc('Add new') }} + {{ 'url_wildcard.list.action.create'|trans|desc('Add') }} {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { 'id': modal_data_target, - 'message': 'tab.urls.modal.message'|trans|desc('Do you want to delete the selected custom URL alias(es)?'), + 'message': 'tab.urls.modal.message'|trans|desc('Delete the selected custom URL aliases permanently?'), 'data_click': '#' ~ form_custom_url_remove.remove.vars.id, }%} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/language/list.html.twig b/src/bundle/Resources/views/themes/admin/language/list.html.twig index 3a812d79ff..9b037a569f 100644 --- a/src/bundle/Resources/views/themes/admin/language/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/list.html.twig @@ -154,7 +154,9 @@ {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { 'id': modal_data_target, - 'message': 'language.modal.message'|trans|desc('Do you want to delete the language(s)?'), + 'message': 'language.modal.message'|trans|desc( + 'Delete the languages?' + ), 'data_click': '#languages_delete_delete', }%} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig index 4839c6fa80..892e5c8406 100644 --- a/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/modal/delete_confirmation.html.twig @@ -6,7 +6,7 @@ {% trans_default_domain 'language' %} {% block body_content %} -

{{ 'language.modal.message'|trans|desc('Do you want to delete the language(s)?') }}

+

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

{% endblock %} {% block footer_content %} {{ form_widget(deleteForm.delete, { 'attr': {'class': 'btn ibexa-btn ibexa-btn--primary'} }) }} diff --git a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig index ac855316c1..cf1aea171d 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/list.html.twig @@ -7,7 +7,7 @@ {{ form_start(form, {'attr': {'class': 'ibexa-search-links-form'}}) }}
{{ form_widget(form.searchQuery, { attr: { - 'placeholder': 'url.search.placeholder'|trans, + 'placeholder': 'url.search.placeholder'|trans|desc('Search for URLs'), }}) }}
@@ -69,14 +69,14 @@ {% include '@ibexadesign/ui/component/table/table.html.twig' with { headline: 'url.list.title'|trans({ '%count%': urls.count })|desc('Links (%count%)'), head_cols: [ - { content: 'url.label.address'|trans }, - { content: 'url.label.status'|trans }, - { content: 'url.label.last_checked'|trans }, - { content: 'url.label.modified'|trans }, + { content: 'url.label.address'|trans|desc('Address') }, + { content: 'url.label.status'|trans|desc('Status') }, + { content: 'url.label.last_checked'|trans|desc('Last checked') }, + { content: 'url.label.modified'|trans|desc('Modified') }, { }, ], body_rows, - empty_table_info_text: 'url.list.no_urls'|trans, + empty_table_info_text: 'url.list.no_urls'|trans|desc('No URLs'), } %} {% if urls.haveToPaginate %} diff --git a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig index f7b394ad40..f7a86d6ca9 100644 --- a/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/link_manager/view.html.twig @@ -34,7 +34,7 @@ - {{ 'url.label.address'|trans }} + {{ 'url.label.address'|trans|desc('Address') }} {{ url.url }} - {{ 'url.label.status'|trans }} - {{ url.isValid ? 'url.status.valid'|trans : 'url.status.invalid'|trans }} + {{ 'url.label.status'|trans|desc('Status') }} + {{ + url.isValid + ? 'url.status.valid'|trans|desc('Valid') + : 'url.status.invalid'|trans|desc('Invalid') + }} - {{ 'url.label.last_checked'|trans }} + {{ 'url.label.last_checked'|trans|desc('Last checked') }} {% if url.lastChecked %} {{ url.lastChecked|ibexa_full_datetime }} @@ -61,11 +65,11 @@ - {{ 'url.label.created'|trans }} + {{ 'url.label.created'|trans|desc('Created') }} {{ url.created|ibexa_full_datetime }} - {{ 'url.label.modified'|trans }} + {{ 'url.label.modified'|trans|desc('Modified') }} {{ url.modified|ibexa_full_datetime }} diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig index 7e9afdfe53..53135c40de 100644 --- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig @@ -65,7 +65,7 @@ class="form-control ibexa-input ibexa-input--text ibexa-trash-search-form__input" data-content-type-identifiers="{{ user_content_type_identifier|join(',') }}" value="{{ creator_exists ? ibexa_content_name(creator) }}" - placeholder="{{ 'search.creator_input.placeholder'|trans|desc('Type creator\'s name') }}" + placeholder="{{ 'search.creator_input.placeholder'|trans|desc('Search by creator') }}" {{ creator_exists ? 'disabled' }} > {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { 'id': modal_data_target, - 'message': 'trash.modal.message'|trans|desc('Do you want to delete the selected item(s) from Trash?'), + 'message': 'trash.modal.message'|trans|desc('Delete the selected items permanently?'), 'data_click': '#trash_item_delete_delete', }%} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig index c885e2f1e0..4c5966f9d9 100644 --- a/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig @@ -7,10 +7,9 @@ {% block body_content %}

- {{ 'trash.delete.all.confirm'|trans({'%trashItemsCount%': trash_items_count})|desc('Are you sure you want to permanently delete %trashItemsCount% item(s)?') }} -

-

- {{ 'trash.delete.all.info'|trans|desc('This action cannot be reversed') }} + {{ 'trash.delete.all.confirm'|trans({'%trashItemsCount%': trash_items_count})|desc( + 'Permanently delete items: %trashItemsCount%?' + ) }}

{% endblock %} {% block footer_content %} diff --git a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig index f77b5f7289..db87fcf73a 100644 --- a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig @@ -7,13 +7,13 @@ {% block breadcrumbs %} {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') }, - { value: 'url_management.breadcrumb.list'|trans|desc('URL Management') }, + { value: 'url_management.breadcrumb.list'|trans|desc('URL management') }, ]} %} {% endblock %} {% block header %} {% include '@ibexadesign/ui/page_title.html.twig' with { - title: 'url_management.view.list.title'|trans|desc('URL Management'), + title: 'url_management.view.list.title'|trans|desc('URL management'), } %} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig index c71691c619..77cc2df298 100644 --- a/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_wildcard/update.html.twig @@ -6,7 +6,7 @@ {% block breadcrumbs %} {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [ { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') }, - { value: 'url_wildcard.breadcrumb.list'|trans|desc('URL Management'), url: path('ibexa.url_management', { + { value: 'url_wildcard.breadcrumb.list'|trans|desc('URL management'), url: path('ibexa.url_management', { '_fragment': 'ibexa-tab-link-manager-url-wildcards', }) }, { value: 'url_wildcard.breadcrumb.edit'|trans|desc('Edit') } diff --git a/src/lib/Form/Data/ContentTypeData.php b/src/lib/Form/Data/ContentTypeData.php index 94e3e0da27..7a9534a73c 100644 --- a/src/lib/Form/Data/ContentTypeData.php +++ b/src/lib/Form/Data/ContentTypeData.php @@ -9,13 +9,15 @@ namespace Ibexa\AdminUi\Form\Data; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeUpdateStruct; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; /** * Base data class for ContentType update form, with FieldDefinitions data and ContentTypeDraft. * * @property \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeDraft $contentTypeDraft */ -class ContentTypeData extends ContentTypeUpdateStruct implements NewnessCheckable +class ContentTypeData extends ContentTypeUpdateStruct implements NewnessCheckable, TranslationContainerInterface { /** * Trait which provides isNew(), and mandates getIdentifier(). @@ -111,6 +113,18 @@ static function ($a, $b): int { $this->fieldDefinitionsData[$key] = $fieldDefinitionByGroup; } } + + public static function getTranslationMessages(): array + { + return [ + Message::create('ez.content_type.descriptions', 'validators') + ->setDesc('Content Type description cannot be longer than 255 characters.'), + Message::create('ez.content_type.identifier.pattern', 'validators') + ->setDesc('Content Type identifier may only contain letters from "a" to "z", numbers and underscores.'), + Message::create('ez.content_type.names', 'validators') + ->setDesc('Content Type name cannot be blank and cannot be longer than 255 characters.'), + ]; + } } class_alias(ContentTypeData::class, 'EzSystems\EzPlatformAdminUi\Form\Data\ContentTypeData'); diff --git a/src/lib/Form/Data/FieldDefinitionData.php b/src/lib/Form/Data/FieldDefinitionData.php index 90ae2717f9..a47f6f1654 100644 --- a/src/lib/Form/Data/FieldDefinitionData.php +++ b/src/lib/Form/Data/FieldDefinitionData.php @@ -9,6 +9,8 @@ namespace Ibexa\AdminUi\Form\Data; use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; /** * Base class for FieldDefinition forms, with corresponding FieldDefinition object. @@ -16,7 +18,7 @@ * @property \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition * @property \Ibexa\AdminUi\Form\Data\ContentTypeData $contentTypeData */ -class FieldDefinitionData extends FieldDefinitionUpdateStruct +class FieldDefinitionData extends FieldDefinitionUpdateStruct implements TranslationContainerInterface { public bool $enabled; @@ -37,6 +39,16 @@ public function getFieldTypeIdentifier() { return $this->fieldDefinition->fieldTypeIdentifier; } + + public static function getTranslationMessages(): array + { + return [ + Message::create('ez.field_definition.descriptions', 'validators') + ->setDesc('Field definition description cannot be longer than 255 characters.'), + Message::create('ez.field_definition.names', 'validators') + ->setDesc('Field definition name cannot be blank cannot be longer than 255 characters.'), + ]; + } } class_alias( diff --git a/src/lib/Form/Data/Section/SectionCreateData.php b/src/lib/Form/Data/Section/SectionCreateData.php index 7de21402ab..73b5c46e71 100644 --- a/src/lib/Form/Data/Section/SectionCreateData.php +++ b/src/lib/Form/Data/Section/SectionCreateData.php @@ -8,12 +8,14 @@ namespace Ibexa\AdminUi\Form\Data\Section; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Validator\Constraints as Assert; /** * @todo add validation */ -class SectionCreateData +class SectionCreateData implements TranslationContainerInterface { /** * @var string|null @@ -82,6 +84,14 @@ public function setName(?string $name): self return $this; } + + public static function getTranslationMessages(): array + { + return [ + Message::create('ez.section.identifier.format', 'validators') + ->setDesc('Section identifier may only contain letters from "a" to "z", numbers and underscores.'), + ]; + } } class_alias(SectionCreateData::class, 'EzSystems\EzPlatformAdminUi\Form\Data\Section\SectionCreateData'); diff --git a/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php b/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php index 5efeb65da7..fbc2c382d4 100644 --- a/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php +++ b/src/lib/Form/Type/FieldDefinition/FieldDefinitionType.php @@ -165,7 +165,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $form->add('isThumbnail', CheckboxType::class, [ 'required' => false, - 'label' => 'field_definition.is_thumbnail', + 'label' => /** @Desc("Can be a thumbnail") */ 'field_definition.is_thumbnail', 'disabled' => $isTranslation || !$this->thumbnailStrategy->hasStrategy($fieldTypeIdentifier), ]); diff --git a/src/lib/Form/Type/Trash/TrashEmptyType.php b/src/lib/Form/Type/Trash/TrashEmptyType.php index 448bcbb497..e2869a0227 100644 --- a/src/lib/Form/Type/Trash/TrashEmptyType.php +++ b/src/lib/Form/Type/Trash/TrashEmptyType.php @@ -33,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'empty', SubmitType::class, [ - 'label' => /** @Desc("Delete permanently") */ + 'label' => /** @Desc("Delete") */ 'trash_empty_form.empty', ] ); diff --git a/src/lib/Form/Type/URL/URLListType.php b/src/lib/Form/Type/URL/URLListType.php index eb325e0791..52dd0f9199 100644 --- a/src/lib/Form/Type/URL/URLListType.php +++ b/src/lib/Form/Type/URL/URLListType.php @@ -42,12 +42,14 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add('status', ChoiceType::class, [ 'choices' => [ - $this->translator->trans(/** @Desc("Invalid") */ + $this->translator->trans( + /** @Desc("Invalid") */ 'url.status.invalid', [], 'ezplatform_content_forms_url' ) => false, - $this->translator->trans(/** @Desc("Valid") */ + $this->translator->trans( + /** @Desc("Valid") */ 'url.status.valid', [], 'ezplatform_content_forms_url' diff --git a/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php b/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php index c7117b124d..e7b663e981 100644 --- a/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php @@ -13,11 +13,13 @@ use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\ChangeOwnerLimitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormInterface; use Symfony\Contracts\Translation\TranslatorInterface; -final class ChangeOwnerLimitationMapper implements LimitationValueMapperInterface, LimitationFormMapperInterface +final class ChangeOwnerLimitationMapper implements LimitationValueMapperInterface, LimitationFormMapperInterface, TranslationContainerInterface { private TranslatorInterface $translator; @@ -81,4 +83,14 @@ public function setFormTemplate(string $formTemplate): void { $this->formTemplate = $formTemplate; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('changeowner'), + 'ezplatform_content_forms_policies' + ))->setDesc('Change Owner'), + ]; + } } diff --git a/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php b/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php index 19ea04cad8..2fb55b0746 100644 --- a/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php @@ -10,10 +10,13 @@ use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; -class ContentTypeLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class ContentTypeLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { use LoggerAwareTrait; @@ -53,6 +56,24 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('class'), + 'ezplatform_content_forms_policies' + ))->setDesc('Content Type'), + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('parentclass'), + 'ezplatform_content_forms_policies' + ))->setDesc('Content Type of Parent'), + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('parentgroup'), + 'ezplatform_content_forms_policies' + ))->setDesc('Content Type Group of Parent'), + ]; + } } class_alias(ContentTypeLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\ContentTypeLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/GroupLimitationMapper.php b/src/lib/Limitation/Mapper/GroupLimitationMapper.php index 239ee868d6..cbcaf84f39 100644 --- a/src/lib/Limitation/Mapper/GroupLimitationMapper.php +++ b/src/lib/Limitation/Mapper/GroupLimitationMapper.php @@ -8,9 +8,12 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; -class GroupLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class GroupLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { /** * @var \Symfony\Contracts\Translation\TranslatorInterface @@ -43,6 +46,16 @@ public function mapLimitationValue(Limitation $limitation) ), ]; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('group'), + 'ezplatform_content_forms_policies' + ))->setDesc('Content Type Group'), + ]; + } } class_alias(GroupLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\GroupLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/LanguageLimitationMapper.php b/src/lib/Limitation/Mapper/LanguageLimitationMapper.php index f1c0eddbdd..5767f33b50 100644 --- a/src/lib/Limitation/Mapper/LanguageLimitationMapper.php +++ b/src/lib/Limitation/Mapper/LanguageLimitationMapper.php @@ -10,10 +10,13 @@ use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\LanguageService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; -class LanguageLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class LanguageLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { use LoggerAwareTrait; @@ -52,6 +55,16 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('language'), + 'ezplatform_content_forms_policies' + ))->setDesc('Language'), + ]; + } } class_alias(LanguageLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\LanguageLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php index 62534a8ed9..d099412e03 100644 --- a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php +++ b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php @@ -16,7 +16,9 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentName; use Ibexa\Contracts\Core\Repository\Values\Filter\Filter; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; use Ibexa\Core\Limitation\MemberOfLimitationType; +use JMS\TranslationBundle\Model\Message; use Symfony\Contracts\Translation\TranslatorInterface; final class MemberOfLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface @@ -97,4 +99,14 @@ private function getSelfUserGroupLabel(): string 'ezplatform_content_forms_role' ); } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('memberof'), + 'ezplatform_content_forms_policies' + ))->setDesc('MemberOf'), + ]; + } } diff --git a/src/lib/Limitation/Mapper/NullLimitationMapper.php b/src/lib/Limitation/Mapper/NullLimitationMapper.php index 4686e82cbf..1e981058cb 100644 --- a/src/lib/Limitation/Mapper/NullLimitationMapper.php +++ b/src/lib/Limitation/Mapper/NullLimitationMapper.php @@ -9,9 +9,12 @@ use Ibexa\AdminUi\Limitation\LimitationFormMapperInterface; use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Form\FormInterface; -class NullLimitationMapper implements LimitationFormMapperInterface, LimitationValueMapperInterface +class NullLimitationMapper implements LimitationFormMapperInterface, LimitationValueMapperInterface, TranslationContainerInterface { /** * @var string @@ -40,6 +43,16 @@ public function mapLimitationValue(Limitation $limitation) { return $limitation->limitationValues; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('status'), + 'ezplatform_content_forms_policies' + ))->setDesc('Status'), + ]; + } } class_alias(NullLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\NullLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php b/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php index 815083688a..b634dd9387 100644 --- a/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php @@ -11,10 +11,13 @@ use Ibexa\Contracts\Core\Repository\ObjectStateService; use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; -class ObjectStateLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class ObjectStateLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { use LoggerAwareTrait; @@ -68,6 +71,20 @@ protected function getObjectStateLabel(ObjectState $state) return $groupName . ':' . $stateName; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('newstate'), + 'ezplatform_content_forms_policies' + ))->setDesc('New State'), + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('state'), + 'ezplatform_content_forms_policies' + ))->setDesc('State'), + ]; + } } class_alias(ObjectStateLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\ObjectStateLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/OwnerLimitationMapper.php b/src/lib/Limitation/Mapper/OwnerLimitationMapper.php index 9dc75b2918..7fbf8c4dd9 100644 --- a/src/lib/Limitation/Mapper/OwnerLimitationMapper.php +++ b/src/lib/Limitation/Mapper/OwnerLimitationMapper.php @@ -8,9 +8,12 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; -class OwnerLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class OwnerLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { /** * @var \Symfony\Contracts\Translation\TranslatorInterface @@ -44,6 +47,20 @@ public function mapLimitationValue(Limitation $limitation) ), ]; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('owner'), + 'ezplatform_content_forms_policies' + ))->setDesc('Owner'), + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('parentowner'), + 'ezplatform_content_forms_policies' + ))->setDesc('Owner of Parent'), + ]; + } } class_alias(OwnerLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\OwnerLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php b/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php index 21b68cbd59..4fe25d9d55 100644 --- a/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php @@ -8,8 +8,11 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; -class ParentDepthLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class ParentDepthLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { /** * @var int The maximum possible depth to use in a limitation @@ -35,6 +38,16 @@ public function mapLimitationValue(Limitation $limitation) { return $limitation->limitationValues; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('parentdepth'), + 'ezplatform_content_forms_policies' + ))->setDesc('Parent Depth'), + ]; + } } class_alias(ParentDepthLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\ParentDepthLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/RoleLimitationMapper.php b/src/lib/Limitation/Mapper/RoleLimitationMapper.php index 98a2a4ac8d..0d7a5b60c6 100644 --- a/src/lib/Limitation/Mapper/RoleLimitationMapper.php +++ b/src/lib/Limitation/Mapper/RoleLimitationMapper.php @@ -11,8 +11,11 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\Contracts\Core\Repository\RoleService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; -final class RoleLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +final class RoleLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { private RoleService $roleService; @@ -42,4 +45,14 @@ public function mapLimitationValue(Limitation $limitation): array return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('role'), + 'ezplatform_content_forms_policies' + ))->setDesc('Role'), + ]; + } } diff --git a/src/lib/Limitation/Mapper/SectionLimitationMapper.php b/src/lib/Limitation/Mapper/SectionLimitationMapper.php index 0c72b55c60..736490d4a4 100644 --- a/src/lib/Limitation/Mapper/SectionLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SectionLimitationMapper.php @@ -10,10 +10,13 @@ use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\SectionService; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Psr\Log\LoggerAwareTrait; use Psr\Log\NullLogger; -class SectionLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class SectionLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { use LoggerAwareTrait; @@ -51,6 +54,20 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('newsection'), + 'ezplatform_content_forms_policies' + ))->setDesc('New Section'), + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('section'), + 'ezplatform_content_forms_policies' + ))->setDesc('Section'), + ]; + } } class_alias(SectionLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\SectionLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php b/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php index 8def6df43e..02625c0ca9 100644 --- a/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php @@ -9,9 +9,12 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperInterface; use Ibexa\AdminUi\Siteaccess\SiteAccessKeyGeneratorInterface; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; use Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; -class SiteAccessLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +class SiteAccessLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { /** @var \Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface */ private $siteAccessService; @@ -48,6 +51,16 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('siteaccess'), + 'ezplatform_content_forms_policies' + ))->setDesc('SiteAccess'), + ]; + } } class_alias(SiteAccessLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\SiteAccessLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php b/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php index 91b15789f2..44c64ba7e0 100755 --- a/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php @@ -11,8 +11,11 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor; use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Path; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; -class SubtreeLimitationMapper extends UDWBasedMapper +class SubtreeLimitationMapper extends UDWBasedMapper implements TranslationContainerInterface { public function filterLimitationValues(Limitation $limitation) { @@ -62,6 +65,16 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('subtree'), + 'ezplatform_content_forms_policies' + ))->setDesc('Subtree'), + ]; + } } class_alias(SubtreeLimitationMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\SubtreeLimitationMapper'); diff --git a/src/lib/Limitation/Mapper/UDWBasedMapper.php b/src/lib/Limitation/Mapper/UDWBasedMapper.php index 68af04d5e0..3af02f39ae 100755 --- a/src/lib/Limitation/Mapper/UDWBasedMapper.php +++ b/src/lib/Limitation/Mapper/UDWBasedMapper.php @@ -19,13 +19,15 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Path; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormInterface; /** * Base class for mappers based on Universal Discovery Widget. */ -class UDWBasedMapper implements LimitationFormMapperInterface, LimitationValueMapperInterface +class UDWBasedMapper implements LimitationFormMapperInterface, LimitationValueMapperInterface, TranslationContainerInterface { /** * @var \Ibexa\Contracts\Core\Repository\LocationService @@ -121,6 +123,16 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('node'), + 'ezplatform_content_forms_policies' + ))->setDesc('Location'), + ]; + } } class_alias(UDWBasedMapper::class, 'EzSystems\EzPlatformAdminUi\Limitation\Mapper\UDWBasedMapper'); diff --git a/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php b/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php index 554ba52dfd..397a3ea44b 100644 --- a/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php +++ b/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php @@ -17,12 +17,14 @@ use Ibexa\Contracts\Core\Repository\Values\User\Limitation; use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; use Ibexa\User\Form\ChoiceList\Loader\UserGroupsChoiceLoader; +use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\FormInterface; -final class UserPermissionsLimitationMapper implements LimitationValueMapperInterface, LimitationFormMapperInterface +final class UserPermissionsLimitationMapper implements LimitationValueMapperInterface, LimitationFormMapperInterface, TranslationContainerInterface { private RoleService $roleService; @@ -131,4 +133,14 @@ public function mapLimitationValue(Limitation $limitation) return $values; } + + public static function getTranslationMessages(): array + { + return [ + Message::create(new Message( + LimitationIdentifierToLabelConverter::convert('userpermissions'), + 'ezplatform_content_forms_policies' + ))->setDesc('User Permissions'), + ]; + } } diff --git a/src/lib/Menu/MainMenuBuilder.php b/src/lib/Menu/MainMenuBuilder.php index 4b32b429ce..0e69432501 100644 --- a/src/lib/Menu/MainMenuBuilder.php +++ b/src/lib/Menu/MainMenuBuilder.php @@ -381,7 +381,7 @@ public static function getTranslationMessages(): array (new Message(self::ITEM_ADMIN__CONTENT_TYPES, 'menu'))->setDesc('Content Types'), (new Message(self::ITEM_ADMIN__USERS, 'menu'))->setDesc('Users'), (new Message(self::ITEM_ADMIN__OBJECT_STATES, 'menu'))->setDesc('Object States'), - (new Message(self::ITEM_ADMIN__URL_MANAGEMENT, 'menu'))->setDesc('URL Management'), + (new Message(self::ITEM_ADMIN__URL_MANAGEMENT, 'menu'))->setDesc('URL management'), ]; } } From 02fae29c954a8981c41d3015a122ea7b36a9ecbf Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 7 Aug 2023 15:54:39 +0200 Subject: [PATCH 13/21] FT: User Settings -> User settings --- .../EventListener/CredentialsExpirationWarningListener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/EventListener/CredentialsExpirationWarningListener.php b/src/lib/EventListener/CredentialsExpirationWarningListener.php index 7c7eb83e2d..a1e62e1ebb 100644 --- a/src/lib/EventListener/CredentialsExpirationWarningListener.php +++ b/src/lib/EventListener/CredentialsExpirationWarningListener.php @@ -87,7 +87,7 @@ private function generateNotification(DateTimeInterface $passwordExpiresAt): voi if ($passwordExpiresIn->d > 0) { $warning = $this->translator->trans( - /** @Desc("Your current password will expire in %days% day(s). You can change it in User settings/My account settings.") */ + /** @Desc("Your current password will expire in %days% day(s). You can change it in User settings/My Account Settings.") */ 'authentication.credentials_expire_in.warning', [ '%days%' => $passwordExpiresIn->d + ($passwordExpiresIn->h >= 12 ? 1 : 0), @@ -97,7 +97,7 @@ private function generateNotification(DateTimeInterface $passwordExpiresAt): voi ); } else { $warning = $this->translator->trans( - /** @Desc("Your current password will expire today. You can change it in User settings/My account settings.") */ + /** @Desc("Your current password will expire today. You can change it in User settings/My Account Settings.") */ 'authentication.credentials_expire_today.warning', [ '%url%' => $this->urlGenerator->generate('ibexa.user_profile.change_password'), From 5533aa44d09dd3e8c4d08e3b7a923ffa79993911 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 7 Aug 2023 15:56:57 +0200 Subject: [PATCH 14/21] FT: My ... --- .../EventListener/CredentialsExpirationWarningListener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/EventListener/CredentialsExpirationWarningListener.php b/src/lib/EventListener/CredentialsExpirationWarningListener.php index a1e62e1ebb..7c7eb83e2d 100644 --- a/src/lib/EventListener/CredentialsExpirationWarningListener.php +++ b/src/lib/EventListener/CredentialsExpirationWarningListener.php @@ -87,7 +87,7 @@ private function generateNotification(DateTimeInterface $passwordExpiresAt): voi if ($passwordExpiresIn->d > 0) { $warning = $this->translator->trans( - /** @Desc("Your current password will expire in %days% day(s). You can change it in User settings/My Account Settings.") */ + /** @Desc("Your current password will expire in %days% day(s). You can change it in User settings/My account settings.") */ 'authentication.credentials_expire_in.warning', [ '%days%' => $passwordExpiresIn->d + ($passwordExpiresIn->h >= 12 ? 1 : 0), @@ -97,7 +97,7 @@ private function generateNotification(DateTimeInterface $passwordExpiresAt): voi ); } else { $warning = $this->translator->trans( - /** @Desc("Your current password will expire today. You can change it in User settings/My Account Settings.") */ + /** @Desc("Your current password will expire today. You can change it in User settings/My account settings.") */ 'authentication.credentials_expire_today.warning', [ '%url%' => $this->urlGenerator->generate('ibexa.user_profile.change_password'), From 316fc97ba24ff5a465281706f140f71757295814 Mon Sep 17 00:00:00 2001 From: mikolaj Date: Thu, 10 Aug 2023 09:26:12 +0200 Subject: [PATCH 15/21] IBX-6314: Added missing translation of limitation name --- .../translations/content_url.en.xliff | 10 +- ...ezplatform_content_forms_policies.en.xliff | 106 ++++++++++++++++++ .../Resources/translations/messages.en.xliff | 105 +---------------- .../Resources/translations/section.en.xliff | 5 - .../Mapper/ChangeOwnerLimitationMapper.php | 4 +- .../Mapper/ContentTypeLimitationMapper.php | 12 +- .../Mapper/GroupLimitationMapper.php | 4 +- .../Mapper/LanguageLimitationMapper.php | 4 +- .../Mapper/MemberOfLimitationMapper.php | 4 +- .../Mapper/NullLimitationMapper.php | 4 +- .../Mapper/ObjectStateLimitationMapper.php | 8 +- .../Mapper/OwnerLimitationMapper.php | 8 +- .../Mapper/ParentDepthLimitationMapper.php | 4 +- .../Mapper/RoleLimitationMapper.php | 4 +- .../Mapper/SectionLimitationMapper.php | 8 +- .../Mapper/SiteAccessLimitationMapper.php | 4 +- .../Mapper/SubtreeLimitationMapper.php | 4 +- src/lib/Limitation/Mapper/UDWBasedMapper.php | 4 +- .../UserPermissionsLimitationMapper.php | 4 +- 19 files changed, 156 insertions(+), 150 deletions(-) create mode 100644 src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff diff --git a/src/bundle/Resources/translations/content_url.en.xliff b/src/bundle/Resources/translations/content_url.en.xliff index 124215bbf1..2f6b9377ec 100644 --- a/src/bundle/Resources/translations/content_url.en.xliff +++ b/src/bundle/Resources/translations/content_url.en.xliff @@ -101,6 +101,11 @@ This item has no custom URL aliases. key: tab.urls.no_custom_urls + + Add new custom URL aliases manually + Add new custom URL aliases manually + key: tab.urls.no_custom_urls.action + This Content item has no system URLs. This Content item has no system URLs. @@ -131,11 +136,6 @@ URL key: tab.urls.url - - Add new custom URL aliases manually - Add new custom URL aliases manually - key: tab.variants.empty.action - diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff b/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff new file mode 100644 index 0000000000..824a8d8ca4 --- /dev/null +++ b/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff @@ -0,0 +1,106 @@ + + + +
+ + The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. +
+ + + Change Owner + Change Owner + key: policy.limitation.identifier.changeowner + + + Content Type + Content Type + key: policy.limitation.identifier.class + + + Content Type Group + Content Type Group + key: policy.limitation.identifier.group + + + Language + Language + key: policy.limitation.identifier.language + + + New Section + New Section + key: policy.limitation.identifier.newsection + + + New State + New State + key: policy.limitation.identifier.newstate + + + Location + Location + key: policy.limitation.identifier.node + + + Owner + Owner + key: policy.limitation.identifier.owner + + + Content Type of Parent + Content Type of Parent + key: policy.limitation.identifier.parentclass + + + Parent Depth + Parent Depth + key: policy.limitation.identifier.parentdepth + + + Content Type Group of Parent + Content Type Group of Parent + key: policy.limitation.identifier.parentgroup + + + Owner of Parent + Owner of Parent + key: policy.limitation.identifier.parentowner + + + Role + Role + key: policy.limitation.identifier.role + + + Section + Section + key: policy.limitation.identifier.section + + + SiteAccess + SiteAccess + key: policy.limitation.identifier.siteaccess + + + State + State + key: policy.limitation.identifier.state + + + Status + Status + key: policy.limitation.identifier.status + + + Subtree + Subtree + key: policy.limitation.identifier.subtree + + + User Permissions + User Permissions + key: policy.limitation.identifier.userpermissions + + + + diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index a4d7ec34cd..93dd5b6c59 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -271,6 +271,11 @@ Delete key: custom_url_alias_add_form.remove + + None + None + key: custom_url_alias_add_form.site_access.placeholder + for the selected period]]> for the selected period]]> @@ -573,101 +578,6 @@ Do you want to delete the Object state group(s)? key: object_state_group.modal.message - - Change Owner - Change Owner - key: policy.limitation.identifier.changeowner - - - Content Type - Content Type - key: policy.limitation.identifier.class - - - Content Type Group - Content Type Group - key: policy.limitation.identifier.group - - - Language - Language - key: policy.limitation.identifier.language - - - New Section - New Section - key: policy.limitation.identifier.newsection - - - New State - New State - key: policy.limitation.identifier.newstate - - - Location - Location - key: policy.limitation.identifier.node - - - Owner - Owner - key: policy.limitation.identifier.owner - - - Content Type of Parent - Content Type of Parent - key: policy.limitation.identifier.parentclass - - - Parent Depth - Parent Depth - key: policy.limitation.identifier.parentdepth - - - Content Type Group of Parent - Content Type Group of Parent - key: policy.limitation.identifier.parentgroup - - - Owner of Parent - Owner of Parent - key: policy.limitation.identifier.parentowner - - - Role - Role - key: policy.limitation.identifier.role - - - Section - Section - key: policy.limitation.identifier.section - - - SiteAccess - SiteAccess - key: policy.limitation.identifier.siteaccess - - - State - State - key: policy.limitation.identifier.state - - - Status - Status - key: policy.limitation.identifier.status - - - Subtree - Subtree - key: policy.limitation.identifier.subtree - - - User Permissions - User Permissions - key: policy.limitation.identifier.userpermissions - None None @@ -743,11 +653,6 @@ Swap the Content item at this Location with another key: tab.locations.swap_with_another - - None - None - key: tab.urls.add.empty.label - Restore archived version Restore archived version diff --git a/src/bundle/Resources/translations/section.en.xliff b/src/bundle/Resources/translations/section.en.xliff index 5a105f2aa9..e54a7cefea 100644 --- a/src/bundle/Resources/translations/section.en.xliff +++ b/src/bundle/Resources/translations/section.en.xliff @@ -6,11 +6,6 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. - - No content. Drafts you create will show up here - No content. Drafts you create will show up here - key: dashboard.tab.my_drafts.empty - Delete Delete diff --git a/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php b/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php index e7b663e981..cb8aca96a6 100644 --- a/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ChangeOwnerLimitationMapper.php @@ -87,10 +87,10 @@ public function setFormTemplate(string $formTemplate): void public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('changeowner'), 'ezplatform_content_forms_policies' - ))->setDesc('Change Owner'), + )->setDesc('Change Owner'), ]; } } diff --git a/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php b/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php index 2fb55b0746..f8ce3f1a54 100644 --- a/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ContentTypeLimitationMapper.php @@ -60,18 +60,18 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('class'), 'ezplatform_content_forms_policies' - ))->setDesc('Content Type'), - Message::create(new Message( + )->setDesc('Content Type'), + Message::create( LimitationIdentifierToLabelConverter::convert('parentclass'), 'ezplatform_content_forms_policies' - ))->setDesc('Content Type of Parent'), - Message::create(new Message( + )->setDesc('Content Type of Parent'), + Message::create( LimitationIdentifierToLabelConverter::convert('parentgroup'), 'ezplatform_content_forms_policies' - ))->setDesc('Content Type Group of Parent'), + )->setDesc('Content Type Group of Parent'), ]; } } diff --git a/src/lib/Limitation/Mapper/GroupLimitationMapper.php b/src/lib/Limitation/Mapper/GroupLimitationMapper.php index cbcaf84f39..594465aea0 100644 --- a/src/lib/Limitation/Mapper/GroupLimitationMapper.php +++ b/src/lib/Limitation/Mapper/GroupLimitationMapper.php @@ -50,10 +50,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('group'), 'ezplatform_content_forms_policies' - ))->setDesc('Content Type Group'), + )->setDesc('Content Type Group'), ]; } } diff --git a/src/lib/Limitation/Mapper/LanguageLimitationMapper.php b/src/lib/Limitation/Mapper/LanguageLimitationMapper.php index 5767f33b50..68afa46540 100644 --- a/src/lib/Limitation/Mapper/LanguageLimitationMapper.php +++ b/src/lib/Limitation/Mapper/LanguageLimitationMapper.php @@ -59,10 +59,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('language'), 'ezplatform_content_forms_policies' - ))->setDesc('Language'), + )->setDesc('Language'), ]; } } diff --git a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php index d099412e03..41b8d97bd3 100644 --- a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php +++ b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php @@ -103,10 +103,10 @@ private function getSelfUserGroupLabel(): string public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('memberof'), 'ezplatform_content_forms_policies' - ))->setDesc('MemberOf'), + )->setDesc('MemberOf'), ]; } } diff --git a/src/lib/Limitation/Mapper/NullLimitationMapper.php b/src/lib/Limitation/Mapper/NullLimitationMapper.php index 1e981058cb..3f7c3355fb 100644 --- a/src/lib/Limitation/Mapper/NullLimitationMapper.php +++ b/src/lib/Limitation/Mapper/NullLimitationMapper.php @@ -47,10 +47,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('status'), 'ezplatform_content_forms_policies' - ))->setDesc('Status'), + )->setDesc('Status'), ]; } } diff --git a/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php b/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php index b634dd9387..4559ecf526 100644 --- a/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ObjectStateLimitationMapper.php @@ -75,14 +75,14 @@ protected function getObjectStateLabel(ObjectState $state) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('newstate'), 'ezplatform_content_forms_policies' - ))->setDesc('New State'), - Message::create(new Message( + )->setDesc('New State'), + Message::create( LimitationIdentifierToLabelConverter::convert('state'), 'ezplatform_content_forms_policies' - ))->setDesc('State'), + )->setDesc('State'), ]; } } diff --git a/src/lib/Limitation/Mapper/OwnerLimitationMapper.php b/src/lib/Limitation/Mapper/OwnerLimitationMapper.php index 7fbf8c4dd9..e575b431a2 100644 --- a/src/lib/Limitation/Mapper/OwnerLimitationMapper.php +++ b/src/lib/Limitation/Mapper/OwnerLimitationMapper.php @@ -51,14 +51,14 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('owner'), 'ezplatform_content_forms_policies' - ))->setDesc('Owner'), - Message::create(new Message( + )->setDesc('Owner'), + Message::create( LimitationIdentifierToLabelConverter::convert('parentowner'), 'ezplatform_content_forms_policies' - ))->setDesc('Owner of Parent'), + )->setDesc('Owner of Parent'), ]; } } diff --git a/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php b/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php index 4fe25d9d55..8721ab294b 100644 --- a/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php +++ b/src/lib/Limitation/Mapper/ParentDepthLimitationMapper.php @@ -42,10 +42,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('parentdepth'), 'ezplatform_content_forms_policies' - ))->setDesc('Parent Depth'), + )->setDesc('Parent Depth'), ]; } } diff --git a/src/lib/Limitation/Mapper/RoleLimitationMapper.php b/src/lib/Limitation/Mapper/RoleLimitationMapper.php index 0d7a5b60c6..24e53702c0 100644 --- a/src/lib/Limitation/Mapper/RoleLimitationMapper.php +++ b/src/lib/Limitation/Mapper/RoleLimitationMapper.php @@ -49,10 +49,10 @@ public function mapLimitationValue(Limitation $limitation): array public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('role'), 'ezplatform_content_forms_policies' - ))->setDesc('Role'), + )->setDesc('Role'), ]; } } diff --git a/src/lib/Limitation/Mapper/SectionLimitationMapper.php b/src/lib/Limitation/Mapper/SectionLimitationMapper.php index 736490d4a4..1ecb313cb7 100644 --- a/src/lib/Limitation/Mapper/SectionLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SectionLimitationMapper.php @@ -58,14 +58,14 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('newsection'), 'ezplatform_content_forms_policies' - ))->setDesc('New Section'), - Message::create(new Message( + )->setDesc('New Section'), + Message::create( LimitationIdentifierToLabelConverter::convert('section'), 'ezplatform_content_forms_policies' - ))->setDesc('Section'), + )->setDesc('Section'), ]; } } diff --git a/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php b/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php index 02625c0ca9..89d643feb0 100644 --- a/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SiteAccessLimitationMapper.php @@ -55,10 +55,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('siteaccess'), 'ezplatform_content_forms_policies' - ))->setDesc('SiteAccess'), + )->setDesc('SiteAccess'), ]; } } diff --git a/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php b/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php index 44c64ba7e0..a74d9c8dfc 100755 --- a/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php +++ b/src/lib/Limitation/Mapper/SubtreeLimitationMapper.php @@ -69,10 +69,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('subtree'), 'ezplatform_content_forms_policies' - ))->setDesc('Subtree'), + )->setDesc('Subtree'), ]; } } diff --git a/src/lib/Limitation/Mapper/UDWBasedMapper.php b/src/lib/Limitation/Mapper/UDWBasedMapper.php index 3af02f39ae..bc74fadadd 100755 --- a/src/lib/Limitation/Mapper/UDWBasedMapper.php +++ b/src/lib/Limitation/Mapper/UDWBasedMapper.php @@ -127,10 +127,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('node'), 'ezplatform_content_forms_policies' - ))->setDesc('Location'), + )->setDesc('Location'), ]; } } diff --git a/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php b/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php index 397a3ea44b..d2771dda15 100644 --- a/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php +++ b/src/lib/Limitation/Mapper/UserPermissionsLimitationMapper.php @@ -137,10 +137,10 @@ public function mapLimitationValue(Limitation $limitation) public static function getTranslationMessages(): array { return [ - Message::create(new Message( + Message::create( LimitationIdentifierToLabelConverter::convert('userpermissions'), 'ezplatform_content_forms_policies' - ))->setDesc('User Permissions'), + )->setDesc('User Permissions'), ]; } } From 78afce9879fccdc5e9cb05c2ef5752b7024ec30c Mon Sep 17 00:00:00 2001 From: tischsoic Date: Wed, 30 Aug 2023 15:30:22 +0200 Subject: [PATCH 16/21] prettier --- .../content-create-widget/content.create.widget.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js index 7101220c8a..c324ab7cd1 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-widget/content.create.widget.js @@ -80,7 +80,11 @@ const ContentCreateWidget = () => { const createLabel = Translator.trans(/*@Desc("Create")*/ 'create_content.create', {}, 'universal_discovery_widget'); const closeLabel = Translator.trans(/*@Desc("Close")*/ 'popup.close.label', {}, 'universal_discovery_widget'); const cancelLabel = Translator.trans(/*@Desc("Cancel")*/ 'content_create.cancel.label', {}, 'universal_discovery_widget'); - const placeholder = Translator.trans(/*@Desc("Search by Content Type")*/ 'content_create.placeholder', {}, 'universal_discovery_widget'); + const placeholder = Translator.trans( + /*@Desc("Search by Content Type")*/ 'content_create.placeholder', + {}, + 'universal_discovery_widget', + ); const filtersDescLabel = Translator.trans( /*@Desc("Or choose from list")*/ 'content.create.filters.desc', {}, From 6cdd1bf783d2ab892a2b2734b933e9b589568b89 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 31 Aug 2023 12:59:34 +0200 Subject: [PATCH 17/21] Send to trash --- src/lib/Behat/Page/ContentViewPage.php | 2 +- src/lib/Menu/ContentRightSidebarBuilder.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Behat/Page/ContentViewPage.php b/src/lib/Behat/Page/ContentViewPage.php index 1a65d42c07..1bfb3badec 100644 --- a/src/lib/Behat/Page/ContentViewPage.php +++ b/src/lib/Behat/Page/ContentViewPage.php @@ -269,7 +269,7 @@ public function isChildElementPresent(array $parameters): bool public function sendToTrash() { - $this->contentActionsMenu->clickButton('Delete'); + $this->contentActionsMenu->clickButton('Send to trash'); $this->dialog->verifyIsLoaded(); $this->dialog->confirm(); } diff --git a/src/lib/Menu/ContentRightSidebarBuilder.php b/src/lib/Menu/ContentRightSidebarBuilder.php index ee5b7873d7..4833b215a8 100644 --- a/src/lib/Menu/ContentRightSidebarBuilder.php +++ b/src/lib/Menu/ContentRightSidebarBuilder.php @@ -301,7 +301,7 @@ public static function getTranslationMessages(): array return [ (new Message(self::ITEM__CREATE, 'menu'))->setDesc('Create content'), (new Message(self::ITEM__EDIT, 'menu'))->setDesc('Edit'), - (new Message(self::ITEM__SEND_TO_TRASH, 'menu'))->setDesc('Delete'), + (new Message(self::ITEM__SEND_TO_TRASH, 'menu'))->setDesc('Send to trash'), (new Message(self::ITEM__COPY, 'menu'))->setDesc('Copy'), (new Message(self::ITEM__COPY_SUBTREE, 'menu'))->setDesc('Copy Subtree'), (new Message(self::ITEM__MOVE, 'menu'))->setDesc('Move'), From 113d3d02a6069c24902f5b8bea6e5885383dad84 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Thu, 31 Aug 2023 12:59:51 +0200 Subject: [PATCH 18/21] generated translations --- .../Resources/translations/bookmark.en.xliff | 4 +- .../Resources/translations/content.en.xliff | 8 ++-- .../translations/content_create.en.xliff | 4 +- .../translations/content_edit.en.xliff | 4 +- .../translations/content_type.en.xliff | 8 ++-- .../translations/content_url.en.xliff | 8 ++-- .../Resources/translations/dashboard.en.xliff | 28 ++++++------- .../translations/draft_conflict.en.xliff | 4 +- .../Resources/translations/drafts.en.xliff | 8 ++-- .../edit_translation_button.en.xliff | 4 +- .../ezplatform_url_wildcard.en.xliff | 4 +- .../Resources/translations/forms.en.xliff | 8 ++-- .../translations/linkmanager.en.xliff | 8 ++-- .../translations/locationview.en.xliff | 32 +++++++-------- .../Resources/translations/menu.en.xliff | 8 ++-- .../Resources/translations/messages.en.xliff | 40 +++++++++---------- .../translations/multi_file_upload.en.xliff | 4 +- .../Resources/translations/role.en.xliff | 8 ++-- .../Resources/translations/sub_items.en.xliff | 8 ++-- .../universal_discovery_widget.en.xliff | 16 ++++---- .../translations/user_create.en.xliff | 4 +- .../Resources/translations/user_edit.en.xliff | 4 +- .../translations/user_invitation.en.xliff | 4 +- .../translations/user_settings.en.xliff | 12 +++--- .../translations/validators.en.xliff | 4 +- 25 files changed, 122 insertions(+), 122 deletions(-) diff --git a/src/bundle/Resources/translations/bookmark.en.xliff b/src/bundle/Resources/translations/bookmark.en.xliff index d61739679a..813b22c152 100644 --- a/src/bundle/Resources/translations/bookmark.en.xliff +++ b/src/bundle/Resources/translations/bookmark.en.xliff @@ -17,8 +17,8 @@ key: bookmark.headline - Edit content - Edit content + Edit + Edit key: bookmark.list.content.edit diff --git a/src/bundle/Resources/translations/content.en.xliff b/src/bundle/Resources/translations/content.en.xliff index 460455b744..4c04367cf2 100644 --- a/src/bundle/Resources/translations/content.en.xliff +++ b/src/bundle/Resources/translations/content.en.xliff @@ -57,8 +57,8 @@ key: content_edit.autosave.status_saved.message.full - under %location_name% - under %location_name% + Location: %location% + Location: %location% key: editing_details @@ -77,8 +77,8 @@ key: trash.modal.message - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. key: trash_container.modal.message_main diff --git a/src/bundle/Resources/translations/content_create.en.xliff b/src/bundle/Resources/translations/content_create.en.xliff index 1ed53a7915..3f841e9378 100644 --- a/src/bundle/Resources/translations/content_create.en.xliff +++ b/src/bundle/Resources/translations/content_create.en.xliff @@ -12,8 +12,8 @@ key: creating - under %location_name% in %language% - under %location_name% in %language% + Location: %location% Translation: %language + Location: %location% Translation: %language key: editing_details diff --git a/src/bundle/Resources/translations/content_edit.en.xliff b/src/bundle/Resources/translations/content_edit.en.xliff index 9b910e161b..83f16fd190 100644 --- a/src/bundle/Resources/translations/content_edit.en.xliff +++ b/src/bundle/Resources/translations/content_edit.en.xliff @@ -27,8 +27,8 @@ key: editing - under %location_name% in %language% - under %location_name% in %language% + Location: %location% Translation: %language + Location: %location% Translation: %language key: editing_details diff --git a/src/bundle/Resources/translations/content_type.en.xliff b/src/bundle/Resources/translations/content_type.en.xliff index 962054131a..d2e3b4ffc2 100644 --- a/src/bundle/Resources/translations/content_type.en.xliff +++ b/src/bundle/Resources/translations/content_type.en.xliff @@ -7,8 +7,8 @@ - Copy - Copy + Duplicate + Duplicate key: content_type.action.copy @@ -902,8 +902,8 @@ key: location_update_form.update - Enable %type% for this content type - Enable %type% for this content type + Enable %type% for this Content Type + Enable %type% for this Content Type key: meta.enabled diff --git a/src/bundle/Resources/translations/content_url.en.xliff b/src/bundle/Resources/translations/content_url.en.xliff index 2f6b9377ec..3d77f2fa18 100644 --- a/src/bundle/Resources/translations/content_url.en.xliff +++ b/src/bundle/Resources/translations/content_url.en.xliff @@ -7,8 +7,8 @@ - Add new - Add new + Add + Add key: tab.urls.action.add @@ -107,8 +107,8 @@ key: tab.urls.no_custom_urls.action - This Content item has no system URLs. - This Content item has no system URLs. + This item has no system URLs. + This item has no system URLs. key: tab.urls.no_system_urls diff --git a/src/bundle/Resources/translations/dashboard.en.xliff b/src/bundle/Resources/translations/dashboard.en.xliff index 537bf60842..5d167fe9ea 100644 --- a/src/bundle/Resources/translations/dashboard.en.xliff +++ b/src/bundle/Resources/translations/dashboard.en.xliff @@ -27,8 +27,8 @@ key: dashboard.tab.my_content.empty - No content. Drafts you create will show up here - No content. Drafts you create will show up here + You have no drafts yet. Your drafts will show up here. + You have no drafts yet. Your drafts will show up here. key: dashboard.tab.my_drafts.empty @@ -37,18 +37,18 @@ key: dashboard.tab.my_media.empty - Edit Content - Edit Content + Edit + Edit key: dashboard.table.all.content.edit - Edit Media - Edit Media + Edit + Edit key: dashboard.table.all.media.edit - Edit Content - Edit Content + Edit + Edit key: dashboard.table.content.edit @@ -67,8 +67,8 @@ key: dashboard.table.contributor.not_found - Edit Draft - Edit Draft + Edit + Edit key: dashboard.table.draft.edit @@ -77,13 +77,13 @@ key: dashboard.table.draft.unauthorized - Last Saved - Last Saved + Modified + Modified key: dashboard.table.last_saved - Edit Media - Edit Media + Edit + Edit key: dashboard.table.media.edit diff --git a/src/bundle/Resources/translations/draft_conflict.en.xliff b/src/bundle/Resources/translations/draft_conflict.en.xliff index 143378fed3..0f99af44ab 100644 --- a/src/bundle/Resources/translations/draft_conflict.en.xliff +++ b/src/bundle/Resources/translations/draft_conflict.en.xliff @@ -7,8 +7,8 @@ - Add new - Add new + Add + Add key: draft.conflict.add_new diff --git a/src/bundle/Resources/translations/drafts.en.xliff b/src/bundle/Resources/translations/drafts.en.xliff index 411df69090..42945eeb16 100644 --- a/src/bundle/Resources/translations/drafts.en.xliff +++ b/src/bundle/Resources/translations/drafts.en.xliff @@ -17,8 +17,8 @@ key: drafts.list - Edit draft - Edit draft + Edit + Edit key: drafts.list.action.edit @@ -47,8 +47,8 @@ key: drafts.list.empty - Last Saved - Last Saved + Modified + Modified key: drafts.list.last_saved diff --git a/src/bundle/Resources/translations/edit_translation_button.en.xliff b/src/bundle/Resources/translations/edit_translation_button.en.xliff index 1268fca325..e13eab7bf1 100644 --- a/src/bundle/Resources/translations/edit_translation_button.en.xliff +++ b/src/bundle/Resources/translations/edit_translation_button.en.xliff @@ -7,8 +7,8 @@ - Edit Content - Edit Content + Edit + Edit key: edit_translation.edit.title diff --git a/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff b/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff index eb9c4215ca..974e18b6d9 100644 --- a/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff +++ b/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff @@ -7,8 +7,8 @@ - Edit URL wildcard - Edit URL wildcard + Edit + Edit key: url_wildcard.action.edit diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index 4cb09815ec..3141472c16 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -137,8 +137,8 @@ key: location_trash_form.default_trash - Send to Trash - Send to Trash + Delete + Delete key: location_trash_form.trash @@ -282,8 +282,8 @@ key: section_form.name - Change Section - Change Section + Change section + Change section key: section_subtree_assign_form.assign diff --git a/src/bundle/Resources/translations/linkmanager.en.xliff b/src/bundle/Resources/translations/linkmanager.en.xliff index db3428a3da..9aa5278707 100644 --- a/src/bundle/Resources/translations/linkmanager.en.xliff +++ b/src/bundle/Resources/translations/linkmanager.en.xliff @@ -12,13 +12,13 @@ key: tab.name.link_manager - Edit URL - Edit URL + Edit + Edit key: url.action.edit - Edit content - Edit content + Edit + Edit key: url.action.item.edit diff --git a/src/bundle/Resources/translations/locationview.en.xliff b/src/bundle/Resources/translations/locationview.en.xliff index 282e0f7711..8da59b53c9 100644 --- a/src/bundle/Resources/translations/locationview.en.xliff +++ b/src/bundle/Resources/translations/locationview.en.xliff @@ -22,8 +22,8 @@ key: content.create.create_content - under %content_name% - under %content_name% + Location: %content% + Location: %content% key: content.create.editing_details @@ -32,8 +32,8 @@ key: content.create.filters.desc - Type to refine - Type to refine + Search by Content Type + Search by Content Type key: content.create.input.placeholder @@ -67,8 +67,8 @@ key: dashboard.table.relation.unauthorized - Add to Bookmarks - Add to Bookmarks + Add to bookmarks + Add to bookmarks key: location.bookmark.add @@ -77,8 +77,8 @@ key: location.bookmark.remove - Email Address - Email Address + Email address + Email address key: modal.email_address @@ -87,8 +87,8 @@ key: modal.info - Change Section - Change Section + Change section + Change section key: tab.details.change_section @@ -197,8 +197,8 @@ key: tab.details.translations - Add new - Add new + Add + Add key: tab.locations.action.add @@ -207,8 +207,8 @@ key: tab.locations.action.delete - Content Locations - Content Locations + Content locations + Content locations key: tab.locations.content_locations @@ -342,8 +342,8 @@ key: tab.relations.table.relation_type.link - Add new - Add new + Add + Add key: tab.translations.action.add diff --git a/src/bundle/Resources/translations/menu.en.xliff b/src/bundle/Resources/translations/menu.en.xliff index 5f29e7979b..f6c6bab275 100644 --- a/src/bundle/Resources/translations/menu.en.xliff +++ b/src/bundle/Resources/translations/menu.en.xliff @@ -52,8 +52,8 @@ key: content__sidebar_right__reveal - Send to Trash - Send to Trash + Delete + Delete key: content__sidebar_right__send_to_trash @@ -437,8 +437,8 @@ key: user__drafts - User Settings - User Settings + User settings + User settings key: user__settings diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index 93dd5b6c59..e4274df093 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -12,13 +12,13 @@ key: anchor_navigation.close - Your current password will expire in %days% day(s). You can change it in User Settings/My Account Settings. - Your current password will expire in %days% day(s). You can change it in User Settings/My Account Settings. + Your current password will expire in %days% day(s). You can change it in User settings/My account settings. + Your current password will expire in %days% day(s). You can change it in User settings/My account settings. key: authentication.credentials_expire_in.warning - Your current password will expire today. You can change it in User Settings/My Account Settings. - Your current password will expire today. You can change it in User Settings/My Account Settings. + Your current password will expire today. You can change it in User settings/My account settings. + Your current password will expire today. You can change it in User settings/My account settings. key: authentication.credentials_expire_today.warning @@ -367,8 +367,8 @@ key: ezobjectrelationlist.cta.limit.multi - Set up a Relation with one Item - Set up a Relation with one Item + Set up a relation with one Content item + Set up a relation with one Content item key: ezobjectrelationlist.cta.limit.single @@ -564,8 +564,8 @@ key: object_state.modal.message - Add new - Add new + Add + Add key: object_state.new @@ -589,8 +589,8 @@ key: policy.modal.message - Add new - Add new + Add + Add key: policy.view.list.action.add @@ -659,8 +659,8 @@ key: tab.versions.table.action.archived.edit - Edit draft - Edit draft + Edit + Edit key: tab.versions.table.action.draft.edit @@ -749,18 +749,18 @@ key: trash_asset.modal.message_header - '%content_name%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: - '%content_name%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: + '%content%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: + '%content%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: key: trash_asset_single.modal.message_main - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. key: trash_container.modal.message_main - '%content_name%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. - '%content_name%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. + '%content%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. + '%content%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. key: trash_container.modal.message_relations @@ -774,8 +774,8 @@ key: ui.component.tab.tabs_toggler.show - Add new - Add new + Add + Add key: url_wildcard.list.action.create diff --git a/src/bundle/Resources/translations/multi_file_upload.en.xliff b/src/bundle/Resources/translations/multi_file_upload.en.xliff index 1f1a192945..5bd15ec650 100644 --- a/src/bundle/Resources/translations/multi_file_upload.en.xliff +++ b/src/bundle/Resources/translations/multi_file_upload.en.xliff @@ -17,8 +17,8 @@ key: cannot_create_content_structure.message - Cannot get content type by identifier - Cannot get content type by identifier + Cannot get Content Type by identifier + Cannot get Content Type by identifier key: cannot_get_content_type_identifier.message diff --git a/src/bundle/Resources/translations/role.en.xliff b/src/bundle/Resources/translations/role.en.xliff index 6b68c3e0f4..cb23112597 100644 --- a/src/bundle/Resources/translations/role.en.xliff +++ b/src/bundle/Resources/translations/role.en.xliff @@ -7,8 +7,8 @@ - No Limitations - No Limitations + No limitations + No limitations key: limitation_type.none @@ -87,8 +87,8 @@ key: policy.view.edit.title - Edit Limitations - Edit Limitations + Edit + Edit key: policy.view.limitations.title diff --git a/src/bundle/Resources/translations/sub_items.en.xliff b/src/bundle/Resources/translations/sub_items.en.xliff index 69acbd2120..adf28dbaf9 100644 --- a/src/bundle/Resources/translations/sub_items.en.xliff +++ b/src/bundle/Resources/translations/sub_items.en.xliff @@ -72,8 +72,8 @@ key: bulk_delete.error.modal.table_title.users_with_nonusers - Send to Trash - Send to Trash + Delete + Delete key: bulk_delete.popup.confirm.nonusers @@ -192,8 +192,8 @@ key: hide_locations_btn.label - Type to refine - Type to refine + Search by Content Type + Search by Content Type key: instant.filter.placeholder diff --git a/src/bundle/Resources/translations/universal_discovery_widget.en.xliff b/src/bundle/Resources/translations/universal_discovery_widget.en.xliff index d9637f6d48..0e9ef0e0cb 100644 --- a/src/bundle/Resources/translations/universal_discovery_widget.en.xliff +++ b/src/bundle/Resources/translations/universal_discovery_widget.en.xliff @@ -47,8 +47,8 @@ key: close.label - under %content_name% - under %content_name% + Location: %location% + Location: %location% key: content.create.editing_details @@ -67,8 +67,8 @@ key: content_create.label - Type to refine - Type to refine + Search by Content Type + Search by Content Type key: content_create.placeholder @@ -97,13 +97,13 @@ key: copy.title - Create new - Create new + Create + Create key: create_content.create - Create new content - Create new content + Create content + Create content key: create_content.label diff --git a/src/bundle/Resources/translations/user_create.en.xliff b/src/bundle/Resources/translations/user_create.en.xliff index e5e4b48277..e8644d0abc 100644 --- a/src/bundle/Resources/translations/user_create.en.xliff +++ b/src/bundle/Resources/translations/user_create.en.xliff @@ -12,8 +12,8 @@ key: Create - under %location_name% - under %location_name% + Location: %location% + Location: %location% key: editing_details diff --git a/src/bundle/Resources/translations/user_edit.en.xliff b/src/bundle/Resources/translations/user_edit.en.xliff index 0d11974fdc..5bbcbe8765 100644 --- a/src/bundle/Resources/translations/user_edit.en.xliff +++ b/src/bundle/Resources/translations/user_edit.en.xliff @@ -12,8 +12,8 @@ key: editing - under %location_name% - under %location_name% + Location: %location% + Location: %location% key: editing_details diff --git a/src/bundle/Resources/translations/user_invitation.en.xliff b/src/bundle/Resources/translations/user_invitation.en.xliff index 8dee4694d8..d609568654 100644 --- a/src/bundle/Resources/translations/user_invitation.en.xliff +++ b/src/bundle/Resources/translations/user_invitation.en.xliff @@ -72,8 +72,8 @@ key: modal.issue.bad_file.alert.message - Email is required - Email is required + Email cannot be empty + Email cannot be empty key: modal.issue.email.empty.message diff --git a/src/bundle/Resources/translations/user_settings.en.xliff b/src/bundle/Resources/translations/user_settings.en.xliff index b4cd4fe784..7a0ce0b32c 100644 --- a/src/bundle/Resources/translations/user_settings.en.xliff +++ b/src/bundle/Resources/translations/user_settings.en.xliff @@ -7,18 +7,18 @@ - User Settings - User Settings + User settings + User settings key: list.title - My Account Settings - My Account Settings + My account settings + My account settings key: section.my_account_settings - My Preferences - My Preferences + My preferences + My preferences key: section.my_preferences diff --git a/src/bundle/Resources/translations/validators.en.xliff b/src/bundle/Resources/translations/validators.en.xliff index 0421454ddd..c1d09d5690 100644 --- a/src/bundle/Resources/translations/validators.en.xliff +++ b/src/bundle/Resources/translations/validators.en.xliff @@ -82,8 +82,8 @@ key: js.error.address_not_found - {fieldName} cannot be empty. - {fieldName} cannot be empty. + {fieldName} Field cannot be empty + {fieldName} Field cannot be empty key: js.error.empty.field From 88d8f0a7ba1b2bf95e5a62291ea05e924f94e021 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 09:31:14 +0200 Subject: [PATCH 19/21] Send to trash fixes --- features/personas/SubtreeEditor.feature | 4 ++-- src/bundle/Resources/translations/forms.en.xliff | 12 ++++++------ src/bundle/Resources/translations/menu.en.xliff | 4 ++-- src/bundle/Resources/translations/sub_items.en.xliff | 4 ++-- .../ui-dev/src/modules/sub-items/sub.items.module.js | 2 +- .../HasUniqueAssetRelation.php | 4 ++-- src/lib/Form/Type/Location/LocationTrashType.php | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/features/personas/SubtreeEditor.feature b/features/personas/SubtreeEditor.feature index 605955910c..42f29fab2d 100644 --- a/features/personas/SubtreeEditor.feature +++ b/features/personas/SubtreeEditor.feature @@ -61,7 +61,7 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task | buttonName | | Create content | | Edit | - And the "Delete" button is not visible + And the "Send to trash" button is not visible Scenario: I cannot edit, create or send to trash Content outside my permissions Given I navigate to content "FolderGrandParent" of type "DedicatedFolder" in "root" @@ -69,4 +69,4 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task | buttonName | | Create content | | Edit | - And the "Delete" button is not visible + And the "Send to trash" button is not visible diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index 3141472c16..05f3b04704 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -132,18 +132,18 @@ key: location_move.move - Send only this Content item to Trash - Send only this Content item to Trash + Send only this Content item to trash + Send only this Content item to trash key: location_trash_form.default_trash - Delete - Delete + Send to trash + Send to trash key: location_trash_form.trash - Send the Content item and its related assets to Trash - Send the Content item and its related assets to Trash + Send the Content item and its related assets to trash + Send the Content item and its related assets to trash key: location_trash_form.trash_with_asset diff --git a/src/bundle/Resources/translations/menu.en.xliff b/src/bundle/Resources/translations/menu.en.xliff index f6c6bab275..0e73d9eb2d 100644 --- a/src/bundle/Resources/translations/menu.en.xliff +++ b/src/bundle/Resources/translations/menu.en.xliff @@ -52,8 +52,8 @@ key: content__sidebar_right__reveal - Delete - Delete + Send to trash + Send to trash key: content__sidebar_right__send_to_trash diff --git a/src/bundle/Resources/translations/sub_items.en.xliff b/src/bundle/Resources/translations/sub_items.en.xliff index adf28dbaf9..dfef857828 100644 --- a/src/bundle/Resources/translations/sub_items.en.xliff +++ b/src/bundle/Resources/translations/sub_items.en.xliff @@ -72,8 +72,8 @@ key: bulk_delete.error.modal.table_title.users_with_nonusers - Delete - Delete + Send to trash + Send to trash key: bulk_delete.popup.confirm.nonusers diff --git a/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js b/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js index 4ce9c5d0a9..2e21d4e96d 100644 --- a/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js +++ b/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js @@ -872,7 +872,7 @@ export default class SubItemsModule extends Component { let confirmLabel = ''; if (!isUserContentItemSelected && isNonUserContentItemSelected) { - confirmLabel = Translator.trans(/*@Desc("Delete")*/ 'bulk_delete.popup.confirm.nonusers', {}, 'sub_items'); + confirmLabel = Translator.trans(/*@Desc("Send to trash")*/ 'bulk_delete.popup.confirm.nonusers', {}, 'sub_items'); } else { confirmLabel = Translator.trans(/*@Desc("Delete")*/ 'bulk_delete.popup.confirm.users_and_users_with_nonusers', {}, 'sub_items'); } diff --git a/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php b/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php index 88548aeef1..c00165ed46 100644 --- a/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php +++ b/src/lib/Form/TrashLocationOptionProvider/HasUniqueAssetRelation.php @@ -56,9 +56,9 @@ public function addOptions(FormInterface $form, Location $location): void /** @Desc("Asset Fields(s)") */ $this->translator->trans('form.trash_assets.label', [], 'forms'), 'choices' => [ - /** @Desc("Send only this Content item to Trash") */ + /** @Desc("Send only this Content item to trash") */ $this->translator->trans('location_trash_form.default_trash', $translatorParameters, 'forms') => self::RADIO_SELECT_DEFAULT_TRASH, - /** @Desc("Send the Content item and its related assets to Trash") */ + /** @Desc("Send the Content item and its related assets to trash") */ $this->translator->trans('location_trash_form.trash_with_asset', $translatorParameters, 'forms') => self::RADIO_SELECT_TRASH_WITH_ASSETS, ], 'help_multiline' => [ diff --git a/src/lib/Form/Type/Location/LocationTrashType.php b/src/lib/Form/Type/Location/LocationTrashType.php index 0f48ff1d45..b20c2374fb 100644 --- a/src/lib/Form/Type/Location/LocationTrashType.php +++ b/src/lib/Form/Type/Location/LocationTrashType.php @@ -56,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add( 'trash', SubmitType::class, - ['label' => /** @Desc("Delete") */ 'location_trash_form.trash'] + ['label' => /** @Desc("Send to trash") */ 'location_trash_form.trash'] ); $builder->get('trash_options')->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { From 77712a18183b2f8af6099b7cabdc76f5a2bc1a3b Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 14:50:47 +0200 Subject: [PATCH 20/21] Behat; phpstan --- src/lib/Behat/Component/Table/TableRow.php | 2 +- src/lib/Limitation/Mapper/MemberOfLimitationMapper.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/Behat/Component/Table/TableRow.php b/src/lib/Behat/Component/Table/TableRow.php index 69bdde3239..f72c08ec56 100644 --- a/src/lib/Behat/Component/Table/TableRow.php +++ b/src/lib/Behat/Component/Table/TableRow.php @@ -117,7 +117,7 @@ protected function specifyLocators(): array new VisibleCSSLocator('edit', '.ibexa-icon--edit,[data-original-title="Edit"]'), new VisibleCSSLocator('de-active', '[data-original-title="De-activate"]'), new VisibleCSSLocator('active', '[data-original-title="Activate"]'), - new VisibleCSSLocator('copy', '[data-original-title="Copy"]'), + new VisibleCSSLocator('copy', '[data-original-title="Duplicate"]'), ]; } } diff --git a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php index 41b8d97bd3..693631cba8 100644 --- a/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php +++ b/src/lib/Limitation/Mapper/MemberOfLimitationMapper.php @@ -19,9 +19,10 @@ use Ibexa\Core\Limitation\LimitationIdentifierToLabelConverter; use Ibexa\Core\Limitation\MemberOfLimitationType; use JMS\TranslationBundle\Model\Message; +use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; -final class MemberOfLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface +final class MemberOfLimitationMapper extends MultipleSelectionBasedMapper implements LimitationValueMapperInterface, TranslationContainerInterface { private UserService $userService; From d1cd0a3c1ab1ee510dc3851885eb92787ee2da21 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Fri, 1 Sep 2023 16:42:19 +0200 Subject: [PATCH 21/21] remove http-factory-guzzle --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 75f1b2b2ee..15b055658b 100644 --- a/composer.json +++ b/composer.json @@ -60,8 +60,7 @@ "willdurand/js-translation-bundle": "^4.0", "twig/twig": "^3.0", "twig/intl-extra": "^3.0", - "twig/string-extra": "^3.0", - "http-interop/http-factory-guzzle": "^1.2" + "twig/string-extra": "^3.0" }, "require-dev": { "ibexa/ci-scripts": "^0.2@dev",