Ticket #37563: 37563.5.diff

src/wp-admin/js/updates.js

@@ -523 +523 @@
                         $message = $( '[data-slug="' + args.slug + '"]' );
                 }
 
-                $message.text( wp.updates.l10n.installing );
+                if ( $message.html() !== wp.updates.l10n.installing ) {
+                        $message.data( 'originaltext', $message.html() );
+                }
 
                 $message
                         .addClass( 'updating-message' )
-                        .attr( 'aria-label', wp.updates.l10n.pluginInstallingLabel.replace( '%s', $message.data( 'name' ) ) );
+                        .attr( 'aria-label', wp.updates.l10n.pluginInstallingLabel.replace( '%s', $message.data( 'name' ) ) )
+                        .text( wp.updates.l10n.installing );
 
                 wp.a11y.speak( wp.updates.l10n.installingMsg, 'polite' );
 
@@ -1709 +1712 @@
                         } else if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                                 $message = $( 'tr[data-plugin="' + job.data.plugin + '"]' ).find( '.update-message' );
                         } else if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
-                                $message = $( '.update-now.updating-message' );
+                                $message = $( '.updating-message' );
                         } else {
                                 $message = $updatingMessage;
                         }
 
-                        if ( $message ) {
+                        if ( $message && $message.hasClass( 'updating-message' ) ) {
                                 originalText = $message.data( 'originaltext' );
 
                                 if ( 'undefined' === typeof originalText ) {
@@ -1724 +1727 @@
                                 $message
                                         .removeClass( 'updating-message' )
                                         .html( originalText );
+
+                                if ( 'update-plugin' === job.action ) {
+                                        $message.attr( 'aria-label', wp.updates.l10n.updateNowLabel.replace( '%s', $message.data( 'name' ) ) );
+                                } else if ( 'install-plugin' === job.action ) {
+                                        $message.attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', $message.data( 'name' ) ) );
+                                }
                         }
 
                         wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' );
@@ -1999 +2008 @@
 
                         // Find all the checkboxes which have been checked.
                         itemsSelected.each( function( index, element ) {
-                                var $checkbox  = $( element ),
+                                var $checkbox = $( element ),
                                         $itemRow = $checkbox.parents( 'tr' );
 
-                                // Un-check the box.
-                                $checkbox.prop( 'checked', false );
-
                                 // Only add update-able items to the update queue.
                                 if ( 'update-selected' === bulkAction && ( ! $itemRow.hasClass( 'update' ) || $itemRow.find( 'notice-error' ).length ) ) {
+
+                                        // Un-check the box.
+                                        $checkbox.prop( 'checked', false );
                                         return;
                                 }
 
@@ -2022 +2031 @@
 
                         // Display bulk notification for updates of any kind.
                         $document.on( 'wp-plugin-update-success wp-plugin-update-error wp-theme-update-success wp-theme-update-error', function( event, response ) {
-                                var $bulkActionNotice, itemName;
+                                var $itemRow = $( '[data-slug="' + response.slug + '"]' ),
+                                        $bulkActionNotice, itemName;
 
                                 if ( 'wp-' + response.update + '-update-success' === event.type ) {
                                         success++;
                                 } else {
-                                        itemName = response.pluginName ? response.pluginName : $( '[data-slug="' + response.slug + '"]' ).find( '.theme-title strong' ).text();
+                                        itemName = response.pluginName ? response.pluginName : $itemRow.find( '.theme-title strong' ).text();
 
                                         error++;
                                         errorMessages.push( itemName + ': ' + response.errorMessage );
                                 }
 
+                                $itemRow.find( 'input[name="checked[]"]:checked' ).prop( 'checked', false );
+
                                 wp.updates.adminNotice = wp.template( 'wp-bulk-updates-admin-notice' );
 
                                 wp.updates.addAdminNotice( {

src/wp-includes/script-loader.php

@@ -616 +616 @@
                                 'updated'                    => __( 'Updated!' ),
                                 'update'                     => __( 'Update' ),
                                 'updateNow'                  => __( 'Update Now' ),
+                                /* translators: %s: Plugin name and version */
+                                'updateNowLabel'             => __( 'Update %s now' ),
                                 'updateFailedShort'          => __( 'Update Failed!' ),
                                 /* translators: %s: Error string for a failed update */
                                 'updateFailed'               => __( 'Update Failed: %s' ),

tests/qunit/fixtures/updates.js

@@ -9 +9 @@
                 'updated': 'Updated!',
                 'update': 'Update',
                 'updateNow': 'Update Now',
+                'updateNowLabel': 'Update Now',
                 'updateFailedShort': 'Update Failed!',
                 'updateFailed': 'Update Failed: %s',
                 'updatingLabel': 'Updating %s...',
@@ -19 +20 @@
                 'updateCancel': 'Update canceled.',
                 'beforeunload': 'Updates may not complete if you navigate away from this page.',
                 'installNow': 'Install Now',
+                'installNowLabel': 'Update %s now',
                 'installing': 'Installing...',
                 'installed': 'Installed!',
                 'installFailedShort': 'Install Failed!',