From d6b18a0f25503652a2a1b3f110b8a4b2ce902a1d Mon Sep 17 00:00:00 2001
From: scruffian <ben@scruffian.com>
Date: Thu, 7 Dec 2023 14:55:18 +0000
Subject: [PATCH 1/4] Improve text and design of the block removal warnings

---
 .../block-removal-warning-modal/index.js      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/block-editor/src/components/block-removal-warning-modal/index.js b/packages/block-editor/src/components/block-removal-warning-modal/index.js
index 08f3deccb5ae08..c48733ff23ced8 100644
--- a/packages/block-editor/src/components/block-removal-warning-modal/index.js
+++ b/packages/block-editor/src/components/block-removal-warning-modal/index.js
@@ -8,7 +8,7 @@ import {
 	Button,
 	__experimentalHStack as HStack,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, _n } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -51,19 +51,12 @@ export function BlockRemovalWarningModal( { rules } ) {
 			title={ __( 'Are you sure?' ) }
 			onRequestClose={ clearBlockRemovalPrompt }
 		>
-			{ blockNamesForPrompt.length === 1 ? (
-				<p>{ rules[ blockNamesForPrompt[ 0 ] ] }</p>
-			) : (
-				<ul style={ { listStyleType: 'disc', paddingLeft: '1rem' } }>
-					{ blockNamesForPrompt.map( ( name ) => (
-						<li key={ name }>{ rules[ name ] }</li>
-					) ) }
-				</ul>
-			) }
 			<p>
-				{ blockNamesForPrompt.length > 1
-					? __( 'Removing these blocks is not advised.' )
-					: __( 'Removing this block is not advised.' ) }
+				{ _n(
+					'Be careful! Post or page content will not be displayed if you delete this block.',
+					'Be careful! Post or page content will not be displayed if you delete these blocks.',
+					blockNamesForPrompt.length
+				) }
 			</p>
 			<HStack justify="right">
 				<Button variant="tertiary" onClick={ clearBlockRemovalPrompt }>

From 61933674726dbb8a70adfc1d8ebaf434dc4f9e36 Mon Sep 17 00:00:00 2001
From: annezazu <annezazu@gmail.com>
Date: Thu, 7 Dec 2023 09:49:07 -0800
Subject: [PATCH 2/4] Updating heading from "Are you sure?" to "Be careful!"

---
 .../src/components/block-removal-warning-modal/index.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/block-removal-warning-modal/index.js b/packages/block-editor/src/components/block-removal-warning-modal/index.js
index c48733ff23ced8..a6de602bcdda81 100644
--- a/packages/block-editor/src/components/block-removal-warning-modal/index.js
+++ b/packages/block-editor/src/components/block-removal-warning-modal/index.js
@@ -48,13 +48,13 @@ export function BlockRemovalWarningModal( { rules } ) {
 
 	return (
 		<Modal
-			title={ __( 'Are you sure?' ) }
+			title={ __( 'Be careful!' ) }
 			onRequestClose={ clearBlockRemovalPrompt }
 		>
 			<p>
 				{ _n(
-					'Be careful! Post or page content will not be displayed if you delete this block.',
-					'Be careful! Post or page content will not be displayed if you delete these blocks.',
+					'Post or page content will not be displayed if you delete this block.',
+					'Post or page content will not be displayed if you delete these blocks.',
 					blockNamesForPrompt.length
 				) }
 			</p>

From d61110aafa79c3ee7cb9c71639fe551510be5a24 Mon Sep 17 00:00:00 2001
From: scruffian <ben@scruffian.com>
Date: Fri, 8 Dec 2023 19:49:49 +0000
Subject: [PATCH 3/4] update tests

---
 test/e2e/specs/site-editor/block-removal.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index 5c46ac769efd3f..cecf7a8f31dbbd 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -34,7 +34,9 @@ test.describe( 'Site editor block removal prompt', () => {
 
 		// Expect the block removal prompt to have appeared
 		await expect(
-			page.getByText( 'Query Loop displays a list of posts or pages.' )
+			page.getByText(
+				'Post or page content will not be displayed if you delete this block.'
+			)
 		).toBeVisible();
 	} );
 
@@ -57,7 +59,7 @@ test.describe( 'Site editor block removal prompt', () => {
 		// Expect the block removal prompt to have appeared
 		await expect(
 			page.getByText(
-				'Post Template displays each post or page in a Query Loop.'
+				'Post or page content will not be displayed if you delete this block.'
 			)
 		).toBeVisible();
 	} );

From 3a15f99a040afa3e2523fcb8910c29f576bc69ef Mon Sep 17 00:00:00 2001
From: scruffian <ben@scruffian.com>
Date: Fri, 8 Dec 2023 20:27:07 +0000
Subject: [PATCH 4/4] update message

---
 test/e2e/specs/site-editor/block-removal.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index cecf7a8f31dbbd..27d3762364b446 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -35,7 +35,7 @@ test.describe( 'Site editor block removal prompt', () => {
 		// Expect the block removal prompt to have appeared
 		await expect(
 			page.getByText(
-				'Post or page content will not be displayed if you delete this block.'
+				'Post or page content will not be displayed if you delete these blocks.'
 			)
 		).toBeVisible();
 	} );