From 921e131eae45801b8fdb1ecfceb5d7839fdfd509 Mon Sep 17 00:00:00 2001
From: Felix Arntz <felix-arntz@leaves-and-love.net>
Date: Mon, 2 Apr 2018 10:15:33 +0000
Subject: [PATCH] General: Improve wording for PHP version nag.

This changeset adjusts the tone of the message to fit the usual core voice better and addresses accessibility concerns.

Props schlessera.
See #41191.

Built from https://develop.svn.wordpress.org/trunk@42891


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

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index fc54e46619..7a268aba83 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -1620,11 +1620,10 @@ function wp_dashboard_php_nag() {
 
 	$information_url = _x( 'https://wordpress.org/support/upgrade-php/', 'localized PHP upgrade information page' );
 
-	$msg = __( 'Hi, it&#8217;s your friends at WordPress here.' );
 	if ( ! $response['is_secure'] ) {
-		$msg .= ' ' . __( 'We noticed that your site is running on an insecure version of PHP, which is why we&#8217;re showing you this notice.' );
+		$msg = __( 'WordPress has detected that your site is running on an insecure version of PHP, which is why we&#8217;re showing you this notice.' );
 	} else {
-		$msg .= ' ' . __( 'We noticed that your site is running on an outdated version of PHP, which is why we&#8217;re showing you this notice.' );
+		$msg = __( 'WordPress has detected that your site is running on an outdated version of PHP, which is why we&#8217;re showing you this notice.' );
 	}
 
 	?>
@@ -1634,15 +1633,13 @@ function wp_dashboard_php_nag() {
 	<p><?php _e( 'PHP is the programming language that WordPress is built on. Newer versions of PHP are both faster and more secure, so upgrading is better for your site, and better for the people who are building WordPress.' ); ?></p>
 	<p><?php _e( 'If you want to know exactly how PHP works and why it is important, continue reading.' ); ?></p>
 
-	<h3><?php _e( 'Okay, how do I update?' ); ?></h3>
+	<h3><?php _e( 'How can I upgrade my PHP version?' ); ?></h3>
 	<p><?php _e( 'The button below will take you to a page with more details on what PHP is, how to upgrade your PHP version, and what to do if it turns out you can&#8217;t.' ); ?></p>
 	<p>
 		<a class="button button-primary button-hero" href="<?php echo esc_url( $information_url ); ?>"><?php _e( 'Show me how to upgrade my PHP' ); ?></a>
 	</p>
 
-	<h3><?php _e( 'Thank you for taking the time to read this!' ); ?></h3>
-	<p><?php _e( 'If you carefully follow the instructions we&#8217;ve provided, upgrading shouldn&#8217;t take more than a few minutes, and it is generally very safe to do.' ); ?></p>
-	<p><?php _e( 'Good luck and happy blogging!' ); ?></p>
+	<p><?php _e( 'Upgrading usually takes only a few minutes and should be safe if you follow the provided instructions.' ); ?></p>
 	<?php
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e12f725a5f..b54e649f2c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42890';
+$wp_version = '5.0-alpha-42891';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.