Do not assume that singular form in _n() is used just for single item (…

…#9711) * Split _n() strings to use separate strigs for cases with just one item. * i18n: Format long lines across multiple
WordPress · Sep 10, 2018 · c967c21 · c967c21
1 parent 8b1926d
commit c967c21
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/edit-post/components/sidebar/settings-header/index.js b/edit-post/components/sidebar/settings-header/index.js
@@ -32,7 +32,11 @@ const SettingsHeader = ( { count, openDocumentSettings, openBlockSettings, sideb
 				className={ `edit-post-sidebar__panel-tab ${ sidebarName === 'edit-post/block' ? 'is-active' : '' }` }
 				aria-label={ __( 'Block settings' ) }
 			>
-				{ sprintf( _n( 'Block', '%d Blocks', count ), count ) }
+				{ (
+					1 === count ?
+						__( 'Block' ) :
+						sprintf( _n( '%d Block', '%d Blocks', count ), count )
+				) }
 			</button>
 		</SidebarHeader>
 	);

diff --git a/packages/editor/src/components/block-switcher/index.js b/packages/editor/src/components/block-switcher/index.js
@@ -74,7 +74,18 @@ export class BlockSwitcher extends Component {
 							onToggle();
 						}
 					};
-					const label = sprintf( _n( 'Change block type', 'Change type of %d blocks', blocks.length ), blocks.length );
+					const label = (
+						1 === blocks.length ?
+							__( 'Change block type' ) :
+							sprintf(
+								_n(
+									'Change type of %d block',
+									'Change type of %d blocks',
+									blocks.length
+								),
+								blocks.length
+							)
+					);
 
 					return (
 						<Toolbar>