diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:57:30 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:57:30 +0000 |
commit | fa9a33d818470a5796f0ff8797f98b510ed8de18 (patch) | |
tree | bde6a1eede376f9b5df5898ce812330152984d8e /wp-admin/update-core.php | |
parent | Releasing progress-linux version 6.4.3+dfsg1-1~progress7.99u1. (diff) | |
download | wordpress-fa9a33d818470a5796f0ff8797f98b510ed8de18.tar.xz wordpress-fa9a33d818470a5796f0ff8797f98b510ed8de18.zip |
Merging upstream version 6.5+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wp-admin/update-core.php')
-rw-r--r-- | wp-admin/update-core.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 7ff7456..80fbd53 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -42,7 +42,7 @@ function list_core_update( $update ) { if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) { $version_string = $update->current; - } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) { + } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version === $update->partial_version ) { $updates = get_core_updates(); if ( $updates && 1 === count( $updates ) ) { // If the only available update is a partial builds, it doesn't need a language-specific version string. @@ -179,9 +179,9 @@ function list_core_update( $update ) { } echo '</p>'; - if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) { + if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package !== $update->locale ) ) { echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>'; - } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { + } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version === $update->partial_version ) ) { // Partial builds don't need language-specific warnings. echo '<p class="hint">' . sprintf( /* translators: %s: WordPress version. */ @@ -1105,8 +1105,15 @@ if ( 'upgrade-core' === $action ) { echo '</h2>'; echo '<p class="update-last-checked">'; - /* translators: 1: Date, 2: Time. */ - printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ), $last_update_check ), date_i18n( __( 'g:i a T' ), $last_update_check ) ); + + printf( + /* translators: 1: Date, 2: Time. */ + __( 'Last checked on %1$s at %2$s.' ), + /* translators: Last update date format. See https://www.php.net/manual/datetime.format.php */ + date_i18n( __( 'F j, Y' ), $last_update_check ), + /* translators: Last update time format. See https://www.php.net/manual/datetime.format.php */ + date_i18n( __( 'g:i a T' ), $last_update_check ) + ); echo ' <a href="' . esc_url( self_admin_url( 'update-core.php?force-check=1' ) ) . '">' . __( 'Check again.' ) . '</a>'; echo '</p>'; |