From 27ec97d21b0dd595113d380bda8a532a25f34079 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 27 Jun 2023 17:47:58 -0400 Subject: [PATCH] Use "detached" copy consistently --- .../block-actions-menu.native.js | 12 ++++-------- packages/block-library/src/block/edit.js | 4 ++-- packages/block-library/src/block/edit.native.js | 16 ++++++---------- .../specs/editor/various/reusable-blocks.test.js | 6 +++--- .../reusable-blocks-manage-button.js | 4 ++-- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/packages/block-editor/src/components/block-mobile-toolbar/block-actions-menu.native.js b/packages/block-editor/src/components/block-mobile-toolbar/block-actions-menu.native.js index e896d6054a8ff..48be5cb8a9c00 100644 --- a/packages/block-editor/src/components/block-mobile-toolbar/block-actions-menu.native.js +++ b/packages/block-editor/src/components/block-mobile-toolbar/block-actions-menu.native.js @@ -213,16 +213,12 @@ const BlockActionsMenu = ( { id: 'convertToRegularBlocksOption', label: innerBlockCount > 1 - ? __( 'Convert to regular blocks' ) - : __( 'Convert to regular block' ), + ? __( 'Detach patterns' ) + : __( 'Detach pattern' ), value: 'convertToRegularBlocksOption', onSelect: () => { - const successNotice = - innerBlockCount > 1 - ? /* translators: %s: name of the reusable block */ - __( '%s converted to regular blocks' ) - : /* translators: %s: name of the reusable block */ - __( '%s converted to regular block' ); + /* translators: %s: name of the synced block */ + const successNotice = __( '%s detached' ); createSuccessNotice( sprintf( successNotice, diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js index cc1ec16aeedc2..0b1f3b01b75b9 100644 --- a/packages/block-library/src/block/edit.js +++ b/packages/block-library/src/block/edit.js @@ -119,8 +119,8 @@ export default function ReusableBlockEdit( { attributes: { ref }, clientId } ) { onClick={ () => convertBlockToStatic( clientId ) } label={ innerBlockCount > 1 - ? __( 'Convert to regular blocks' ) - : __( 'Convert to regular block' ) + ? __( 'Detach patterns' ) + : __( 'Detach pattern' ) } icon={ ungroup } showTooltip diff --git a/packages/block-library/src/block/edit.native.js b/packages/block-library/src/block/edit.native.js index e72aee3858eaf..3466baa6bad71 100644 --- a/packages/block-library/src/block/edit.native.js +++ b/packages/block-library/src/block/edit.native.js @@ -132,12 +132,8 @@ export default function ReusableBlockEdit( { } const onConvertToRegularBlocks = useCallback( () => { - const successNotice = - innerBlockCount > 1 - ? /* translators: %s: name of the reusable block */ - __( '%s converted to regular blocks' ) - : /* translators: %s: name of the reusable block */ - __( '%s converted to regular block' ); + /* translators: %s: name of the synced block */ + const successNotice = __( '%s detached' ); createSuccessNotice( sprintf( successNotice, title ) ); clearSelectedBlock(); @@ -182,17 +178,17 @@ export default function ReusableBlockEdit( { { innerBlockCount > 1 ? __( - 'Alternatively, you can detach and edit these blocks separately by tapping “Convert to regular blocks”.' + 'Alternatively, you can detach and edit these blocks separately by tapping “Detach patterns”.' ) : __( - 'Alternatively, you can detach and edit this block separately by tapping “Convert to regular block”.' + 'Alternatively, you can detach and edit this block separately by tapping “Detach pattern”.' ) } 1 - ? __( 'Convert to regular blocks' ) - : __( 'Convert to regular block' ) + ? __( 'Detach patterns' ) + : __( 'Detach pattern' ) } separatorType="topFullWidth" onPress={ onConvertToRegularBlocks } diff --git a/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js b/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js index 6d9eaa562b48f..1ffd4e2414336 100644 --- a/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js +++ b/packages/e2e-tests/specs/editor/various/reusable-blocks.test.js @@ -113,7 +113,7 @@ describe( 'Reusable blocks', () => { await insertReusableBlock( 'Surprised greeting block' ); // Convert block to a regular block. - await clickBlockToolbarButton( 'Convert to regular block' ); + await clickBlockToolbarButton( 'Detach pattern' ); // Check that we have a paragraph block on the page. const paragraphBlock = await canvas().$( @@ -221,7 +221,7 @@ describe( 'Reusable blocks', () => { await insertReusableBlock( 'Multi-selection reusable block' ); // Convert block to a regular block. - await clickBlockToolbarButton( 'Convert to regular blocks' ); + await clickBlockToolbarButton( 'Detach patterns' ); // Check that we have two paragraph blocks on the page. expect( await getEditedPostContent() ).toMatchSnapshot(); @@ -353,7 +353,7 @@ describe( 'Reusable blocks', () => { // Convert back to regular blocks. await clickBlockToolbarButton( 'Select Pattern' ); - await clickBlockToolbarButton( 'Convert to regular block' ); + await clickBlockToolbarButton( 'Detach pattern' ); await page.waitForXPath( selector, { hidden: true, } ); diff --git a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js index faffefe605ed9..6f33905888511 100644 --- a/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js +++ b/packages/reusable-blocks/src/components/reusable-blocks-menu-items/reusable-blocks-manage-button.js @@ -58,8 +58,8 @@ function ReusableBlocksManageButton( { clientId } ) { { canRemove && ( convertBlockToStatic( clientId ) }> { innerBlockCount > 1 - ? __( 'Convert to regular blocks' ) - : __( 'Convert to regular block' ) } + ? __( 'Detach patterns' ) + : __( 'Detach pattern' ) } ) }