From e56e677ec129be5fc82fc97016ceddda1d87f240 Mon Sep 17 00:00:00 2001
From: ryan
Date: Mon, 11 May 2009 19:44:21 +0000
Subject: [PATCH] Add locale upgrade hint. Props nbachiyski. fixes #8729
git-svn-id: http://svn.automattic.com/wordpress/trunk@11273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/update-core.php | 3 +++
wp-admin/wp-admin.css | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 31bda9140..8daef2e1e 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -13,6 +13,7 @@ if ( ! current_user_can('update_plugins') )
wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
function list_core_update( $update ) {
+ global $wp_local_package;
$version_string = 'en_US' == $update->locale ?
$update->current : sprintf("%s–%s ", $update->current, $update->locale);
$current = false;
@@ -50,6 +51,8 @@ function list_core_update( $update ) {
else
echo ' ';
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.').'
';
echo '';
}
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 8296a5a4d..4d7bd1bc2 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1,4 +1,3 @@
-
textarea,
input,
select {
@@ -2996,6 +2995,12 @@ form.upgrade {
margin-top: 8px;
}
+form.upgrade .hint {
+ font-style: italic;
+ font-size: 85%;
+ margin: -0.5em 0 2em 0;
+}
+
#poststuff .inside .the-tagcloud {
margin: 5px 0 10px;
padding: 8px;