From 75497c683345f55c1ae2a1dbca1abe81926c8d5b Mon Sep 17 00:00:00 2001 From: James Koster Date: Wed, 27 Mar 2024 17:49:54 +0000 Subject: [PATCH 1/4] Simplify template resetting language --- .../page-patterns/dataviews-pattern-actions.js | 10 +++------- .../page-templates-template-parts/actions.js | 10 +++------- .../src/components/template-actions/index.js | 11 ++++------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js index e908a49bb36087..4c3a3736abbd34 100644 --- a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js +++ b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js @@ -326,7 +326,7 @@ export const deleteAction = { export const resetAction = { id: 'reset-action', - label: __( 'Clear customizations' ), + label: __( 'Reset' ), isEligible: ( item ) => { const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE; const hasThemeFile = isTemplatePart && item.templatePart.has_theme_file; @@ -338,11 +338,7 @@ export const resetAction = { const { removeTemplate } = useDispatch( editSiteStore ); return ( - - { __( - 'Are you sure you want to clear these customizations?' - ) } - + { __( 'Reset and clear all customizations?' ) } diff --git a/packages/edit-site/src/components/page-templates-template-parts/actions.js b/packages/edit-site/src/components/page-templates-template-parts/actions.js index baea6d9c0f3def..7de7fd577e5a0d 100644 --- a/packages/edit-site/src/components/page-templates-template-parts/actions.js +++ b/packages/edit-site/src/components/page-templates-template-parts/actions.js @@ -26,7 +26,7 @@ import { TEMPLATE_POST_TYPE } from '../../utils/constants'; export const resetTemplateAction = { id: 'reset-template', - label: __( 'Clear customizations' ), + label: __( 'Reset' ), isEligible: isTemplateRevertable, supportsBulk: true, hideModalHeader: true, @@ -96,11 +96,7 @@ export const resetTemplateAction = { }; return ( - - { __( - 'Are you sure you want to clear these customizations?' - ) } - + { __( 'Reset and clear all customizations?' ) } diff --git a/packages/edit-site/src/components/template-actions/index.js b/packages/edit-site/src/components/template-actions/index.js index 32a8b4ee176d71..7a4b8d354b143a 100644 --- a/packages/edit-site/src/components/template-actions/index.js +++ b/packages/edit-site/src/components/template-actions/index.js @@ -123,11 +123,8 @@ function ResetMenuItem( { template, onClose } ) { } return ( <> - setIsModalOpen( true ) } - > - { __( 'Clear customizations' ) } + setIsModalOpen( true ) }> + { __( 'Reset' ) } setIsModalOpen( false ) } - confirmButtonText={ __( 'Clear' ) } + confirmButtonText={ __( 'Reset' ) } > - { __( 'Are you sure you want to clear these customizations?' ) } + { __( 'Reset and clear all customizations?' ) } ); From 5ab199115e1b537993a97535218ecbdc115a8d3e Mon Sep 17 00:00:00 2001 From: James Koster Date: Thu, 28 Mar 2024 18:17:20 +0000 Subject: [PATCH 2/4] Update confirmation messaging --- .../src/components/page-templates-template-parts/actions.js | 4 ++-- packages/edit-site/src/components/template-actions/index.js | 2 +- packages/edit-site/src/store/actions.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/edit-site/src/components/page-templates-template-parts/actions.js b/packages/edit-site/src/components/page-templates-template-parts/actions.js index 7de7fd577e5a0d..9cf5c074b1b768 100644 --- a/packages/edit-site/src/components/page-templates-template-parts/actions.js +++ b/packages/edit-site/src/components/page-templates-template-parts/actions.js @@ -52,12 +52,12 @@ export const resetTemplateAction = { items.length > 1 ? sprintf( /* translators: The number of items. */ - __( '%s items reverted.' ), + __( '%s items reset.' ), items.length ) : sprintf( /* translators: The template/part's name. */ - __( '"%s" reverted.' ), + __( '"%s" reset.' ), decodeEntities( items[ 0 ].title.rendered ) ), { diff --git a/packages/edit-site/src/components/template-actions/index.js b/packages/edit-site/src/components/template-actions/index.js index 7a4b8d354b143a..7550f494b5d5f4 100644 --- a/packages/edit-site/src/components/template-actions/index.js +++ b/packages/edit-site/src/components/template-actions/index.js @@ -98,7 +98,7 @@ function ResetMenuItem( { template, onClose } ) { createSuccessNotice( sprintf( /* translators: The template/part's name. */ - __( '"%s" reverted.' ), + __( '"%s" reset.' ), decodeEntities( template.title.rendered ) ), { diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js index 6aefab6ea0ff2f..dfe8f81ca21ccf 100644 --- a/packages/edit-site/src/store/actions.js +++ b/packages/edit-site/src/store/actions.js @@ -448,7 +448,7 @@ export const revertTemplate = registry .dispatch( noticesStore ) - .createSuccessNotice( __( 'Template reverted.' ), { + .createSuccessNotice( __( 'Template reset.' ), { type: 'snackbar', id: noticeId, actions: [ From 4d687d8ab56c1d33da32bd43a9be5539021745cd Mon Sep 17 00:00:00 2001 From: ntsekouras Date: Tue, 2 Apr 2024 14:19:36 +0300 Subject: [PATCH 3/4] fix e2e tests --- test/e2e/specs/site-editor/template-revert.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/specs/site-editor/template-revert.spec.js b/test/e2e/specs/site-editor/template-revert.spec.js index 712a51810da114..7b217f6e1f48bc 100644 --- a/test/e2e/specs/site-editor/template-revert.spec.js +++ b/test/e2e/specs/site-editor/template-revert.spec.js @@ -207,10 +207,10 @@ class TemplateRevertUtils { await this.page.click( 'role=region[name="Editor settings"i] >> role=button[name="Actions"i]' ); - await this.page.click( 'role=menuitem[name=/Clear customizations/i]' ); - await this.page.getByRole( 'button', { name: 'Clear' } ).click(); + await this.page.click( 'role=menuitem[name=/Reset/i]' ); + await this.page.getByRole( 'button', { name: 'Reset' } ).click(); await this.page.waitForSelector( - 'role=button[name="Dismiss this notice"i] >> text=/ reverted./' + 'role=button[name="Dismiss this notice"i] >> text=/ reset./' ); } From 5fc27814e44ca4d672920780ecff2c354c9f6a6a Mon Sep 17 00:00:00 2001 From: James Koster Date: Tue, 2 Apr 2024 14:30:51 +0100 Subject: [PATCH 4/4] Mention 'default' in confirmation message --- .../src/components/page-patterns/dataviews-pattern-actions.js | 4 +++- .../src/components/page-templates-template-parts/actions.js | 4 +++- packages/edit-site/src/components/template-actions/index.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js index 4c3a3736abbd34..9030b3bbc73c70 100644 --- a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js +++ b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js @@ -338,7 +338,9 @@ export const resetAction = { const { removeTemplate } = useDispatch( editSiteStore ); return ( - { __( 'Reset and clear all customizations?' ) } + + { __( 'Reset to default and clear all customizations?' ) } +