Changeset 49984

Timestamp:

01/19/2021 04:46:50 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Display version number on the "Re-install now" button on WordPress Updates screen.

This makes the button label more clear and allows for removing unnecessary description.

Props afragen, audrasjb.
Fixes #51774.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-site-health-auto-updates.php (modified) (1 diff)
• update-core.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php

@@ -165 +165 @@
             $description  = __( 'A previous automatic background update ended with a critical failure, so updates are now disabled.' );
             $description .= ' ' . __( 'You would have received an email because of this.' );
-            $description .= ' ' . __( "When you've been able to update using the \"Update Now\" button on Dashboard > Updates, we'll clear this error for future update attempts." );
+            $description .= ' ' . __( "When you've been able to update using the \"Update now\" button on Dashboard > Updates, we'll clear this error for future update attempts." );
             $description .= ' ' . sprintf(
                 /* translators: %s: Code of error shown. */

trunk/src/wp-admin/update-core.php

@@ -39 +39 @@
 
     $wp_version     = get_bloginfo( 'version' );
-    $version_string = sprintf( '%s&ndash;<strong>%s</strong>', $update->current, $update->locale );
+    $version_string = sprintf( '%s&ndash;%s', $update->current, get_locale() );
 
     if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) {
@@ -56 +56 @@
     }
 
-    $submit        = __( 'Update Now' );
+    $is_development_version = preg_match( '/alpha|beta|RC/', $version_string );
+
+    $message       = '';
+    $submit        = $is_development_version ? __( 'Update to latest nightly' ) : __( 'Update now' );
     $form_action   = 'update-core.php?action=do-core-upgrade';
     $php_version   = phpversion();
@@ -67 +70 @@
         if ( $current ) {
             /* translators: %s: WordPress version. */
-            $message     = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
-            $submit      = __( 'Re-install Now' );
+            $submit      = sprintf( __( 'Re-install version %s' ), $version_string );
             $form_action = 'update-core.php?action=do-core-reinstall';
         } else {
@@ -933 +935 @@
 );
 
-$updates_howto  = '<p>' . __( '<strong>WordPress</strong> &mdash; Updating your WordPress installation is a simple one-click procedure: just <strong>click on the &#8220;Update Now&#8221; button</strong> when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '</p>';
+$updates_howto  = '<p>' . __( '<strong>WordPress</strong> &mdash; Updating your WordPress installation is a simple one-click procedure: just <strong>click on the &#8220;Update now&#8221; button</strong> when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '</p>';
 $updates_howto .= '<p>' . __( '<strong>Themes and Plugins</strong> &mdash; To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate &#8220;Update&#8221; button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '</p>';