Ticket #37550: 37550.diff

src/wp-admin/js/updates.js

@@ -350 +350 @@
 
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                         $updateRow = $( 'tr[data-plugin="' + args.plugin + '"]' );
-                        $message   = $updateRow.find( '.update-message' ).addClass( 'updating-message' ).find( 'p' );
+                        $message   = $updateRow.find( '.update-message' ).removeClass( 'notice-error' ).addClass( 'updating-message notice-warning' ).find( 'p' );
                         message    = wp.updates.l10n.updatingLabel.replace( '%s', $updateRow.find( '.plugin-title strong' ).text() );
                 } else if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
                         $card    = $( '.plugin-card-' + args.slug );
@@ -900 +900 @@
                 }, args );
 
                 if ( 'themes-network' === pagenow ) {
-                        $notice = $( '[data-slug="' + args.slug + '"]' ).find( '.update-message' ).addClass( 'updating-message' ).find( 'p' );
+                        $notice = $( '[data-slug="' + args.slug + '"]' ).find( '.update-message' ).removeClass( 'notice-error' ).addClass( 'updating-message notice-warning' ).find( 'p' );
 
                 } else {
                         $notice = $( '#update-theme' ).closest( '.notice' ).removeClass( 'notice-large' );
@@ -1564 +1564 @@
 
                 if ( _.isString( response ) ) {
                         error = response;
+                } else if ( 'undefined' !== typeof response.readyState && 0 == response.readyState ) {
+                        error = wp.updates.l10n.connectionError;
                 } else if ( _.isString( response.responseText ) && '' !== response.responseText ) {
                         error = response.responseText;
                 } else if ( _.isString( response.statusText ) ) {
@@ -2021 +2023 @@
                                 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 : $( '[data-slug="' + response.slug + '"]' ).find( '.column-primary strong' ).text();
 
                                         error++;
                                         errorMessages.push( itemName + ': ' + response.errorMessage );

src/wp-includes/script-loader.php

@@ -679 +679 @@
                                 /* translators: %s: Importer name */
                                 'activateImporterLabel'      => __( 'Run %s' ),
                                 'unknownError'               => __( 'An unknown error occurred' ),
+                                'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
                                 'pluginsFound'               => __( 'Number of plugins found: %d' ),
                                 'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),
                         ),

tests/qunit/fixtures/updates.js

@@ -46 +46 @@
                 'activateThemeLabel':  'Activate %s',
                 'activateImporter': 'Run Importer',
                 'unknownError': 'An unknown error occurred',
+                'connectionError': 'Connection lost or the server is busy. Please try again later.',
                 'pluginsFound': 'Number of plugins found: %d',
                 'noPluginsFound': 'No plugins found. Try a different search.'
         }