From a24a68b2e6e5f6f3170aab79c60d5ff81e7928fa Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 29 Jun 2009 20:25:51 +0000 Subject: [PATCH] Change update string to indicate if version is the original English one, or the local one. Props nbachiyski. fixes #10117 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@11669 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/update-core.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 1f4582421..5bd44c7a9 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -14,7 +14,7 @@ if ( ! current_user_can('update_plugins') ) function list_core_update( $update ) { global $wp_local_package; - $version_string = 'en_US' == $update->locale ? + $version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ? $update->current : sprintf("%s–%s", $update->current, $update->locale); $current = false; if ( !isset($update->response) || 'latest' == $update->response ) @@ -53,6 +53,9 @@ 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. You can skip upgrading if you want to keep your current translation.').'

'; + else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) { + echo '

'.sprintf( __('You are about to install WordPress %s in English. There is a chance this upgrade will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'

'; + } echo ''; }