diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php index a876d0e384..6a871671ee 100644 --- a/src/wp-admin/update-core.php +++ b/src/wp-admin/update-core.php @@ -54,11 +54,13 @@ function list_core_update( $update ) { if ( ! isset( $update->response ) || 'latest' === $update->response ) { $current = true; } + $submit = __( 'Update Now' ); $form_action = 'update-core.php?action=do-core-upgrade'; $php_version = phpversion(); $mysql_version = $wpdb->db_version(); $show_buttons = true; + if ( 'development' === $update->response ) { $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' ); } else { @@ -124,12 +126,14 @@ function list_core_update( $update ) { ); } else { $message = sprintf( - /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary. */ - __( 'You can update to WordPress %2$s automatically:' ), + /* translators: 1: Installed WordPress version number, 2: URL to WordPress release notes, 3: New WordPress version number, including locale if necessary. */ + __( 'You can update from WordPress %1$s to WordPress %3$s automatically:' ), + $wp_version, $version_url, $version_string ); } + if ( ! $mysql_compat || ! $php_compat ) { $show_buttons = false; } @@ -139,8 +143,10 @@ function list_core_update( $update ) { echo '

'; echo $message; echo '

'; + echo '
'; wp_nonce_field( 'upgrade-core' ); + echo '

'; echo ''; echo ''; @@ -160,6 +166,7 @@ function list_core_update( $update ) { } } echo '

'; + if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) { echo '

' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '

'; } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { @@ -170,6 +177,7 @@ function list_core_update( $update ) { 'development' !== $update->response ? $update->current : '' ) . '

'; } + echo '
'; }