Ticket #37583: 37583.patch

src/wp-admin/includes/update.php

@@ -631 +631 @@
 function wp_print_admin_notice_templates() {
         ?>
         <script id="tmpl-wp-updates-admin-notice" type="text/html">
-                <div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{{ data.message }}}</p></div>
+                <div <# if ( data.id ) { #>id="{{ data.id }}"<# } #> class="notice {{ data.className }}"><p>{{ data.message }}</p></div>
         </script>
         <script id="tmpl-wp-bulk-updates-admin-notice" type="text/html">
                 <div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errors ) { #>notice-error<# } else { #>notice-success<# } #>">

src/wp-admin/js/updates.js

@@ -1562 +1562 @@
                         return true;
                 }
 
-                if ( _.isString( response ) ) {
+                if ( _.isString( response ) && '-1' === response ) {
+                        error = wp.updates.l10n.nonceError;
+                } else 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 ) ) {

src/wp-includes/script-loader.php

@@ -677 +677 @@
                                 /* translators: %s: Importer name */
                                 'activateImporterLabel'      => __( 'Run %s' ),
                                 'unknownError'               => __( 'An unknown error occurred' ),
+                                'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
+                                'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
                                 '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.',
+                'nonceError': 'An error has occurred. Please reload the page and try again.',
                 'pluginsFound': 'Number of plugins found: %d',
                 'noPluginsFound': 'No plugins found. Try a different search.'
         }