Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 02:10:45 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@56117


git-svn-id: http://core.svn.wordpress.org/trunk@55629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-06-30 11:13:27 +00:00
parent c625b46d60
commit 7992c49b5f
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/includes/class-wp-site-health.php
View File

@ -2009,12 +2009,8 @@ class WP_Site_Health {
$wp_content = $wp_filesystem->wp_content_dir();
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 */
'<p>' . __( 'The %s directory cannot be located.' ) . '</p>',
@ -2079,12 +2075,8 @@ class WP_Site_Health {
}
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 */
'<p>' . __( 'The %s directory exists but is not writable. This directory is used for plugin and theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
@ -2094,12 +2086,8 @@ class WP_Site_Health {
}
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. */
'<p>' . __( 'The %1$s directory does not exist, and the server does not have write permissions in %2$s to create it. This directory is used for plugin and theme updates. Please make sure the server has write permissions in %2$s.' ) . '</p>',

2
wp-admin/includes/class-wp-upgrader.php
View File

@ -189,7 +189,7 @@ class WP_Upgrader {
$this->strings['fs_unavailable'] = __( 'Could not access filesystem.' );
$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.' );
/* translators: %s: Directory name. */

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.3-beta2-56116';
$wp_version = '6.3-beta2-56117';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.