Changeset 47306

Timestamp:

02/18/2020 04:46:11 PM (7 years ago)

Author:

desrosj

Message:

Site Health: Display the REST API test error codes correctly.

This change fixes an issue where the error codes associated with failed REST API tests are not being printed to the screen. In addition, the square brackets have been replaced with parentheses for consistency, and the error code (which is much less useful to end-users than the error message itself) has been moved to the end of the line.

This also clarifies the associated translator comments.

Props afercia, desrosj.
Fixes #49426.

File:

• trunk/src/wp-admin/includes/class-wp-site-health.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -1864 +1864 @@
                                         __( 'The REST API request failed due to an error.' ),
                                         sprintf(
-                                                /* translators: 1: The HTTP response code. 2: The error message returned. */
-                                                __( 'Error: [%1$s] %2$s' ),
-                                                wp_remote_retrieve_response_code( $r ),
-                                                $r->get_error_message()
+                                                /* translators: 1: The WordPress error message. 2: The WordPress error code. */
+                                                __( 'Error: %1$s (%2$s)' ),
+                                                $r->get_error_message(),
+                                                $r->get_error_code()
                                         )
                                 )
@@ -1879 +1879 @@
                                 '<p>%s</p>',
                                 sprintf(
-                                        /* translators: 1: The HTTP response code returned. 2: The error message returned. */
+                                        /* translators: 1: The HTTP error code. 2: The HTTP error message. */
                                         __( 'The REST API call gave the following unexpected result: (%1$d) %2$s.' ),
                                         wp_remote_retrieve_response_code( $r ),
@@ -2186 +2186 @@
                                         __( 'The loopback request to your site failed, this means features relying on them are not currently working as expected.' ),
                                         sprintf(
-                                                /* translators: 1: The HTTP response code. 2: The error message returned. */
-                                                __( 'Error: [%1$s] %2$s' ),
-                                                wp_remote_retrieve_response_code( $r ),
-                                                $r->get_error_message()
+                                                /* translators: 1: The WordPress error message. 2: The WordPress error code. */
+                                                __( 'Error: %1$s (%2$s)' ),
+                                                $r->get_error_message(),
+                                                $r->get_error_code()
                                         )
                                 ),