Global styles: update return values from getGlobalStylesChanges() (#5…

…8707)

* Leave it up to the consuming component as to how to present the changes. This includes adding a period at the end of any sentences.

* Period.

Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>

packages/block-editor/src/components/global-styles/get-global-styles-changes.js

@@ -50,13 +50,7 @@ function getTranslation( key ) {
 
 	if ( keyArray?.[ 0 ] === 'blocks' ) {
 		const blockName = getBlockNames()?.[ keyArray[ 1 ] ];
-		return blockName
-			? sprintf(
-					// translators: %s: block name.
-					__( '%s block' ),
-					blockName
-			  )
-			: keyArray[ 1 ];
+		return blockName || keyArray[ 1 ];
 	}
 
 	if ( keyArray?.[ 0 ] === 'elements' ) {
@@ -200,7 +194,7 @@ export default function getGlobalStylesChanges( next, previous, options = {} ) {
 		const deleteCount = changesLength - maxResults;
 		const andMoreText = sprintf(
 			// translators: %d: number of global styles changes that are not displayed in the UI.
-			_n( '…and %d more change.', '…and %d more changes.', deleteCount ),
+			_n( '…and %d more change', '…and %d more changes', deleteCount ),
 			deleteCount
 		);
 		changes.splice( maxResults, deleteCount, andMoreText );

packages/block-editor/src/components/global-styles/test/get-global-styles-changes.js

@@ -171,7 +171,7 @@ describe( 'getGlobalStylesChanges', () => {
 		expect( resultA ).toEqual( [
 			'Colors',
 			'Typography',
-			'Test pumpkin flowers block',
+			'Test pumpkin flowers',
 			'H3 element',
 			'Caption element',
 			'H6 element',
@@ -191,8 +191,8 @@ describe( 'getGlobalStylesChanges', () => {
 		expect( resultA ).toEqual( [
 			'Colors',
 			'Typography',
-			'Test pumpkin flowers block',
-			'…and 5 more changes.',
+			'Test pumpkin flowers',
+			'…and 5 more changes',
 		] );
 	} );
 

packages/edit-site/src/components/global-styles/screen-revisions/revisions-buttons.js

@@ -36,7 +36,7 @@ function ChangesSummary( { revision, previousRevision } ) {
 			data-testid="global-styles-revision-changes"
 			className="edit-site-global-styles-screen-revisions__changes"
 		>
-			{ changes.join( ', ' ) }
+			{ changes.join( ', ' ) }.
 		</span>
 	);
 }

packages/editor/src/components/entities-saved-states/entity-type-list.js

@@ -59,7 +59,7 @@ function GlobalStylesDescription( { record } ) {
 			<h3 className="entities-saved-states__description-heading">
 				{ __( 'Changes made to:' ) }
 			</h3>
-			<PanelRow>{ globalStylesChanges.join( ', ' ) }</PanelRow>
+			<PanelRow>{ globalStylesChanges.join( ', ' ) }.</PanelRow>
 		</>
 	) : null;
 }

test/e2e/specs/site-editor/user-global-styles-revisions.spec.js

@@ -57,7 +57,7 @@ test.describe( 'Style Revisions', () => {
 		// Shows changes made in the revision.
 		await expect(
 			page.getByTestId( 'global-styles-revision-changes' )
-		).toHaveText( 'Colors' );
+		).toHaveText( 'Colors.' );
 
 		// There should be 2 revisions not including the reset to theme defaults button.
 		await expect( revisionButtons ).toHaveCount(