i18n: Merge similar translation strings - tables (#24169)

* i18n: Merge similar translation strings - tables See trac ticket https://core.trac.wordpress.org/ticket/47259 * table.test.js - updated translation strings * table.test.js - updated translation strings * fix table test * Update packages/e2e-tests/specs/editor/blocks/table.test.js Co-authored-by: Sören Wrede <[email protected]> Co-authored-by: Sören Wrede <[email protected]>
WordPress · Jul 29, 2020 · 06db150 · 06db150
1 parent fe5b553
commit 06db150
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/packages/block-library/src/table/edit.js b/packages/block-library/src/table/edit.js
@@ -83,17 +83,17 @@ const BACKGROUND_COLORS = [
 const ALIGNMENT_CONTROLS = [
 	{
 		icon: alignLeft,
-		title: __( 'Align Column Left' ),
+		title: __( 'Align column left' ),
 		align: 'left',
 	},
 	{
 		icon: alignCenter,
-		title: __( 'Align Column Center' ),
+		title: __( 'Align column center' ),
 		align: 'center',
 	},
 	{
 		icon: alignRight,
-		title: __( 'Align Column Right' ),
+		title: __( 'Align column right' ),
 		align: 'right',
 	},
 ];
@@ -435,37 +435,37 @@ export class TableEdit extends Component {
 		return [
 			{
 				icon: tableRowBefore,
-				title: __( 'Add Row Before' ),
+				title: __( 'Insert row before' ),
 				isDisabled: ! selectedCell,
 				onClick: this.onInsertRowBefore,
 			},
 			{
 				icon: tableRowAfter,
-				title: __( 'Add Row After' ),
+				title: __( 'Insert row after' ),
 				isDisabled: ! selectedCell,
 				onClick: this.onInsertRowAfter,
 			},
 			{
 				icon: tableRowDelete,
-				title: __( 'Delete Row' ),
+				title: __( 'Delete row' ),
 				isDisabled: ! selectedCell,
 				onClick: this.onDeleteRow,
 			},
 			{
 				icon: tableColumnBefore,
-				title: __( 'Add Column Before' ),
+				title: __( 'Insert column before' ),
 				isDisabled: ! selectedCell,
 				onClick: this.onInsertColumnBefore,
 			},
 			{
 				icon: tableColumnAfter,
-				title: __( 'Add Column After' ),
+				title: __( 'Insert column after' ),
 				isDisabled: ! selectedCell,
 				onClick: this.onInsertColumnAfter,
 			},
 			{
 				icon: tableColumnDelete,
-				title: __( 'Delete Column' ),
+				title: __( 'Delete column' ),
 				isDisabled: ! selectedCell,
 				onClick: this.onDeleteColumn,
 			},
@@ -580,15 +580,15 @@ export class TableEdit extends Component {
 					>
 						<TextControl
 							type="number"
-							label={ __( 'Column Count' ) }
+							label={ __( 'Column count' ) }
 							value={ initialColumnCount }
 							onChange={ this.onChangeInitialColumnCount }
 							min="1"
 							className="blocks-table__placeholder-input"
 						/>
 						<TextControl
 							type="number"
-							label={ __( 'Row Count' ) }
+							label={ __( 'Row count' ) }
 							value={ initialRowCount }
 							onChange={ this.onChangeInitialRowCount }
 							min="1"

diff --git a/packages/e2e-tests/specs/editor/blocks/table.test.js b/packages/e2e-tests/specs/editor/blocks/table.test.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { capitalize } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -24,7 +19,7 @@ const createButtonLabel = 'Create Table';
  */
 async function changeCellAlignment( align ) {
 	await clickBlockToolbarButton( 'Change column alignment' );
-	await clickButton( `Align Column ${ capitalize( align ) }` );
+	await clickButton( `Align column ${ align.toLowerCase() }` );
 }
 
 describe( 'Table', () => {
@@ -37,7 +32,7 @@ describe( 'Table', () => {
 
 		// Check for existence of the column count field.
 		const columnCountLabel = await page.$x(
-			"//div[@data-type='core/table']//label[text()='Column Count']"
+			"//div[@data-type='core/table']//label[text()='Column count']"
 		);
 		expect( columnCountLabel ).toHaveLength( 1 );
 
@@ -52,7 +47,7 @@ describe( 'Table', () => {
 
 		// Check for existence of the row count field.
 		const rowCountLabel = await page.$x(
-			"//div[@data-type='core/table']//label[text()='Row Count']"
+			"//div[@data-type='core/table']//label[text()='Row count']"
 		);
 		expect( rowCountLabel ).toHaveLength( 1 );
 
@@ -165,7 +160,7 @@ describe( 'Table', () => {
 
 		// Add a column.
 		await clickBlockToolbarButton( 'Edit table' );
-		await clickButton( 'Add Column After' );
+		await clickButton( 'Insert column after' );
 
 		// Expect the table to have 3 columns across the header, body and footer.
 		expect( await getEditedPostContent() ).toMatchSnapshot();
@@ -174,7 +169,7 @@ describe( 'Table', () => {
 
 		// Delete a column.
 		await clickBlockToolbarButton( 'Edit table' );
-		await clickButton( 'Delete Column' );
+		await clickButton( 'Delete column' );
 
 		// Expect the table to have 2 columns across the header, body and footer.
 		expect( await getEditedPostContent() ).toMatchSnapshot();
@@ -184,7 +179,7 @@ describe( 'Table', () => {
 		await insertBlock( 'Table' );
 
 		const [ columnCountLabel ] = await page.$x(
-			"//div[@data-type='core/table']//label[text()='Column Count']"
+			"//div[@data-type='core/table']//label[text()='Column count']"
 		);
 		await columnCountLabel.click();
 		await page.keyboard.press( 'Backspace' );