From 3f03bb352e7014dda023800e59aff164a578c4e5 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 13 Mar 2021 10:59:02 +0000
Subject: [PATCH] Site Health: Use a singular string in dashboard widget if
 there is only one critical issue or recommendation.

Props Presskopp, hareesh-pillai.
Fixes #52521.
Built from https://develop.svn.wordpress.org/trunk@50530


git-svn-id: http://core.svn.wordpress.org/trunk@50143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/dashboard.php | 10 +++++++---
 wp-includes/version.php         |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index c7d6a00f44..35e2a9ba9c 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -1873,10 +1873,14 @@ function wp_dashboard_site_health() {
 		</p>
 	<?php else : ?>
 		<p>
-			<?php if ( $issue_counts['critical'] > 0 ) : ?>
-				<?php _e( 'Your site has critical issues that should be addressed as soon as possible to improve its performance and security.' ); ?>
-			<?php elseif ( $issues_total <= 0 ) : ?>
+			<?php if ( $issues_total <= 0 ) : ?>
 				<?php _e( 'Great job! Your site currently passes all site health checks.' ); ?>
+			<?php elseif ( 1 === (int) $issue_counts['critical'] ) : ?>
+				<?php _e( 'Your site has a critical issue that should be addressed as soon as possible to improve its performance and security.' ); ?>
+			<?php elseif ( $issue_counts['critical'] > 1 ) : ?>
+				<?php _e( 'Your site has critical issues that should be addressed as soon as possible to improve its performance and security.' ); ?>
+			<?php elseif ( 1 === (int) $issue_counts['recommended'] ) : ?>
+				<?php _e( 'Your site&#8217;s health is looking good, but there is still one thing you can do to improve its performance and security.' ); ?>
 			<?php else : ?>
 				<?php _e( 'Your site&#8217;s health is looking good, but there are still some things you can do to improve its performance and security.' ); ?>
 			<?php endif; ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ea1b381c5b..07bf3f2fe0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-50529';
+$wp_version = '5.8-alpha-50530';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.