Changeset 56117

Timestamp:

06/30/2023 11:11:13 AM (16 months ago)

Author:

SergeyBiryukov

Message:

Site Health: Correct the label for wp-content directory check.

This removes HTML tags from the label, which were not displayed as expected due to escaping. Including the directory name in the label is also redundant, as it is already mentioned in the check result description directly below.

Includes:

• Adjusting a few other labels for consistency.
• Moving wp-content out of the translatable string in a similar message in WP_Upgrader::generic_strings().

Follow-up to [55720].

Props dlh, mukesh27, audrasjb, SergeyBiryukov.
See #58678.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-site-health.php (modified) (3 diffs)
• class-wp-upgrader.php (modified) (1 diff)

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

@@ -2010 +2010 @@
 
         if ( ! $wp_content ) {
-            $result['status'] = 'critical';
-            $result['label']  = sprintf(
-                /* translators: %s: wp-content */
-                __( 'Unable to locate WordPress content directory (%s)' ),
-                '<code>wp-content</code>'
-            );
+            $result['status']      = 'critical';
+            $result['label']       = __( 'Unable to locate WordPress content directory' );
             $result['description'] = sprintf(
                 /* translators: %s: wp-content */
@@ -2080 +2076 @@
 
         if ( ! $backup_dir_exists && $upgrade_dir_exists && ! $upgrade_dir_is_writable ) {
-            $result['status'] = 'critical';
-            $result['label']  = sprintf(
-                /* translators: %s: upgrade */
-                __( 'The %s directory exists but is not writable' ),
-                'upgrade'
-            );
+            $result['status']      = 'critical';
+            $result['label']       = __( 'The upgrade directory exists but is not writable' );
             $result['description'] = sprintf(
                 /* translators: %s: wp-content/upgrade */
@@ -2095 +2087 @@
 
         if ( ! $upgrade_dir_exists && ! $wp_filesystem->is_writable( $wp_content ) ) {
-            $result['status'] = 'critical';
-            $result['label']  = sprintf(
-                /* translators: %s: upgrade */
-                __( 'The %s directory cannot be created' ),
-                'upgrade'
-            );
+            $result['status']      = 'critical';
+            $result['label']       = __( 'The upgrade directory cannot be created' );
             $result['description'] = sprintf(
                 /* translators: 1: wp-content/upgrade, 2: wp-content. */

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -190 +190 @@
         $this->strings['fs_error']          = __( 'Filesystem error.' );
         $this->strings['fs_no_root_dir']    = __( 'Unable to locate WordPress root directory.' );
-        $this->strings['fs_no_content_dir'] = __( 'Unable to locate WordPress content directory (wp-content).' );
+        $this->strings['fs_no_content_dir'] = sprintf( __( 'Unable to locate WordPress content directory (%s).' ), 'wp-content' );
         $this->strings['fs_no_plugins_dir'] = __( 'Unable to locate WordPress plugin directory.' );
         $this->strings['fs_no_themes_dir']  = __( 'Unable to locate WordPress theme directory.' );