Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Hide language-specific warnings/labels on update-core.php when we are dealing with a point release partial build.

Browse Source 
see #22704, #18200.

Built from https://develop.svn.wordpress.org/trunk@25784


git-svn-id: http://core.svn.wordpress.org/trunk@25697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-15 05:08:09 +00:00
parent e503d0e2ec
commit 7b0088c938
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/update-core.php
View File

@ -22,11 +22,17 @@ if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes'
wp_die( __( 'You do not have sufficient permissions to update this site.' ) ); wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
function list_core_update( $update ) { function list_core_update( $update ) {
global $wp_local_package, $wpdb; global $wp_local_package, $wpdb, $wp_version;
static $first_pass = true; static $first_pass = true;
$version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ? if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
$update->current : sprintf("%s&ndash;<strong>%s</strong>", $update->current, $update->locale); $version_string = $update->current;
// If the only available update is a partial builds, it doesn't need a language-specific version string.
elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) )
$version_string = $update->current;
else
$version_string = sprintf( "%s&ndash;<strong>%s</strong>", $update->current, $update->locale );
$current = false; $current = false;
if ( !isset($update->response) || 'latest' == $update->response ) if ( !isset($update->response) || 'latest' == $update->response )
$current = true; $current = true;
@ -89,7 +95,8 @@ function list_core_update( $update ) {
echo '</p>'; 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. You can skip upgrading if you want to keep your current translation.').'</p>'; echo '<p class="hint">'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'</p>';
else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) { // Partial builds don't need language-specific warnings.
elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->response != 'development' ? $update->current : '' ).'</p>'; echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->response != 'development' ? $update->current : '' ).'</p>';
} }
echo '</form>'; echo '</form>';