From 1c52ad8d3f1df7602adaae779c4f9360146b1112 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 21 Jul 2020 15:53:04 +0000
Subject: [PATCH] Site Health: Move `post_max_size` and `upload_max_filesize`
 out of a translatable string in file upload checks.

Simplify some other strings, use a consistent format for translator comments.

Follow-up to [48535].

See #50038.
Built from https://develop.svn.wordpress.org/trunk@48539


git-svn-id: http://core.svn.wordpress.org/trunk@48301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-site-health.php | 17 +++++++++++------
 wp-includes/version.php                    |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php
index 7e55ec515d..79686addf4 100644
--- a/wp-admin/includes/class-wp-site-health.php
+++ b/wp-admin/includes/class-wp-site-health.php
@@ -1973,8 +1973,8 @@ class WP_Site_Health {
 			'description' => sprintf(
 				'<p>%s</p>',
 				sprintf(
-					/* translators: %1$s: file_uploads %2$s: php.ini */
-					__( 'The %1$s directive in %2$s determines if uploading to is allowed in your WordPress.' ),
+					/* translators: 1: file_uploads, 2: php.ini */
+					__( 'The %1$s directive in %2$s determines if uploading files is allowed on your site.' ),
 					'<code>file_uploads</code>',
 					'<code>php.ini</code>'
 				)
@@ -1998,8 +1998,8 @@ class WP_Site_Health {
 			$result['description'] .= sprintf(
 				'<p>%s</p>',
 				sprintf(
-					/* translators: %1$s: file_uploads %2$s: 0 */
-					__( '%1$s is set to %2$s. You won\'t be able to upload files in your WordPress.' ),
+					/* translators: 1: file_uploads, 2: 0 */
+					__( '%1$s is set to %2$s. You won\'t be able to upload files on your site.' ),
 					'<code>file_uploads</code>',
 					'<code>0</code>'
 				)
@@ -2011,12 +2011,17 @@ class WP_Site_Health {
 		$upload_max_size = ini_get( 'upload_max_filesize' );
 
 		if ( wp_convert_hr_to_bytes( $post_max_size ) !== wp_convert_hr_to_bytes( $upload_max_size ) ) {
-			$result['label']       = __( 'Mismatched "post_max_size" and "upload_max_filesize" values.' );
+			$result['label'] = sprintf(
+				/* translators: 1: post_max_size, 2: upload_max_filesize */
+				__( 'Mismatched "%1$s" and "%2$s" values.' ),
+				'post_max_size',
+				'upload_max_filesize'
+			);
 			$result['status']      = 'recommended';
 			$result['description'] = sprintf(
 				'<p>%s</p>',
 				sprintf(
-					/* translators: %1$s: post_max_size %2$s: upload_max_filesize */
+					/* translators: 1: post_max_size, 2: upload_max_filesize */
 					__( 'The settings for %1$s and %2$s are not the same, this could cause some problems when trying to upload files.' ),
 					'<code>post_max_size</code>',
 					'<code>upload_max_filesize</code>'
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f27772307d..5aaac7bae1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta2-48538';
+$wp_version = '5.5-beta2-48539';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.