Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make template part and reusable block creation language consistent #43032

Merged
merged 2 commits into from
Aug 9, 2022
Merged

Make template part and reusable block creation language consistent #43032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f8035a
Make template part and reusable block creation language consistent
jameskoster Aug 5, 2022
9c7d1eb
Merge branch 'trunk' into update/template-part-reusable-block-creatio…
jameskoster Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/reference-guides/filters/i18n-filters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Here is a simple example, using the `i18n.gettext` filter to override a specific
```jsx
// Define our filter callback.
function myPluginGettextFilter( translation, text, domain ) {
if ( text === 'Add to Reusable blocks' ) {
if ( text === 'Create Reusable block' ) {
return 'Save to MyOrg block library';
}
return translation;
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-test-utils/src/create-reusable-block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const createReusableBlock = async ( content, title ) => {
await page.keyboard.type( content );

await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Add to Reusable blocks' );
await clickMenuItem( 'Create Reusable block' );
const nameInput = await page.waitForSelector(
reusableBlockNameInputSelector
);
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/specs/editor/various/block-editor-keyboard-shortcuts.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe( 'block editor keyboard shortcuts', () => {
} );
it( 'should prevent deleting multiple selected blocks from inputs', async () => {
await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Add to Reusable blocks' );
await clickMenuItem( 'Create Reusable block' );
const reusableBlockNameInputSelector =
'.reusable-blocks-menu-items__convert-modal .components-text-control__input';
const nameInput = await page.waitForSelector(
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-tests/specs/editor/various/reusable-blocks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ describe( 'Reusable blocks', () => {

// Convert block to a reusable block.
await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Add to Reusable blocks' );
await clickMenuItem( 'Create Reusable block' );

// Set title.
const nameInput = await page.waitForSelector(
Expand Down Expand Up @@ -373,7 +373,7 @@ describe( 'Reusable blocks', () => {

// Convert to reusable.
await clickBlockToolbarButton( 'Options' );
await clickMenuItem( 'Add to Reusable blocks' );
await clickMenuItem( 'Create Reusable block' );
const nameInput = await page.waitForSelector(
reusableBlockNameInputSelector
);
Expand Down
4 changes: 3 additions & 1 deletion packages/edit-site/src/components/template-part-converter/convert-to-template-part.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { __ } from '@wordpress/i18n';
import { useState } from '@wordpress/element';
import { store as coreStore } from '@wordpress/core-data';
import { store as noticesStore } from '@wordpress/notices';
import { symbolFilled } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -65,11 +66,12 @@ export default function ConvertToTemplatePart( { clientIds, blocks } ) {
<BlockSettingsMenuControls>
{ () => (
<MenuItem
icon={ symbolFilled }
onClick={ () => {
setIsModalOpen( true );
} }
>
{ __( 'Make template part' ) }
{ __( 'Create Template part' ) }
</MenuItem>
) }
</BlockSettingsMenuControls>
Expand Down
2 changes: 1 addition & 1 deletion ...eusable-blocks/src/components/reusable-blocks-menu-items/reusable-block-convert-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default function ReusableBlockConvertButton( {
setIsModalOpen( true );
} }
>
{ __( 'Add to Reusable blocks' ) }
{ __( 'Create Reusable block' ) }
</MenuItem>
{ isModalOpen && (
<Modal
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/specs/site-editor/template-part.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ test.describe( 'Template Part', () => {
await editor.selectBlocks( paragraphBlock );

// Convert block to a template part.
await editor.clickBlockOptionsMenuItem( 'Make template part' );
await editor.clickBlockOptionsMenuItem( 'Create Template part' );
await page.type( 'role=dialog >> role=textbox[name="Name"i]', 'Test' );
await page.keyboard.press( 'Enter' );

Expand Down Expand Up @@ -156,7 +156,7 @@ test.describe( 'Template Part', () => {
await editor.selectBlocks( paragraphBlock1, paragraphBlock2 );

// Convert block to a template part.
await editor.clickBlockOptionsMenuItem( 'Make template part' );
await editor.clickBlockOptionsMenuItem( 'Create Template part' );
await page.type( 'role=dialog >> role=textbox[name="Name"i]', 'Test' );
await page.keyboard.press( 'Enter' );

Expand Down