Changeset 18224

Timestamp:

06/10/2011 05:37:51 AM (14 years ago)

Author:

nacin

Message:

Update Core UI changes:

• Update Now instead of Update Automatically.
• The first core update is now a primary button.
• Hide the version number from the 'You are about to install WP in English' warning for development versions, as it lies and suggests you will be downgraded.

see #10611.

File:

• trunk/wp-admin/update-core.php (modified) (5 diffs)

trunk/wp-admin/update-core.php

@@ -20 +20 @@
 function list_core_update( $update ) {
     global $wp_local_package, $wpdb;
+    static $first_pass = true;
+
     $version_string = ('en_US' == $update->locale && 'en_US' == get_locale() ) ?
             $update->current : sprintf("%s&ndash;<strong>%s</strong>", $update->current, $update->locale);
@@ -25 +27 @@
     if ( !isset($update->response) || 'latest' == $update->response )
         $current = true;
-    $submit = __('Update Automatically');
+    $submit = __('Update Now');
     $form_action = 'update-core.php?action=do-core-upgrade';
     $php_version    = phpversion();
@@ -36 +38 @@
         if ( $current ) {
             $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
-            $submit = __('Re-install Automatically');
+            $submit = __('Re-install Now');
             $form_action = 'update-core.php?action=do-core-reinstall';
         } else {
@@ -64 +66 @@
     echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
     if ( $show_buttons ) {
-        submit_button( $submit, 'button', 'upgrade', false );
-        echo '&nbsp;<a href="' . esc_url($update->package) . '" class="button">' . $download . '</a>&nbsp;';
+        if ( $first_pass ) {
+            submit_button( $submit, 'button button-primary', 'upgrade', false );
+            $first_pass = false;
+        } else {
+            submit_button( $submit, 'button', 'upgrade', false );
+        }
+        echo '&nbsp;<a href="' . esc_url( $update->package ) . '" class="button">' . $download . '</a>&nbsp;';
     }
     if ( 'en_US' != $update->locale )
@@ -76 +83 @@
         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' ) {
-        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->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>';