Changeset 38222 for branches/4.6/src/wp-admin/includes/class-wp-plugin-install-list-table.php

Timestamp:

08/09/2016 01:15:01 AM (10 years ago)

Author:

jorbin

Message:

Updates: Improve experience for Bulk Actions when FTP is dismissed.

Merges [38221] to the 4.6 branch.

Before this change, when a bulk update was canceled due dismissing the FTP credentials modal, part of the actions didn't get canceled. This meant the "There is a new version of…” notices become blank and the updates you had checked became unchecked. Now, the notices remain and you are essentially returned to the screen you had before. Strings are also updated to improve ARIA usage.

Fixes #37563.
Props ocean90, swissspidy, obenland, afercia.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (3 diffs)

branches/4.6/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -477 +477 @@
                                                 } elseif ( current_user_can( 'activate_plugins' ) ) {
                                                         $button_text  = __( 'Activate' );
+                                                        /* translators: %s: Plugin name */
+                                                        $button_label = _x( 'Activate %s', 'plugin' );
                                                         $activate_url = add_query_arg( array(
                                                                 '_wpnonce'    => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
@@ -485 +487 @@
                                                         if ( is_network_admin() ) {
                                                                 $button_text  = __( 'Network Activate' );
+                                                                /* translators: %s: Plugin name */
+                                                                $button_label = _x( 'Network Activate %s', 'plugin' );
                                                                 $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
                                                         }
@@ -491 +495 @@
                                                                 '<a href="%1$s" class="button activate-now button-secondary" aria-label="%2$s">%3$s</a>',
                                                                 esc_url( $activate_url ),
-                                                                /* translators: %s: Plugin name */
-                                                                esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin['name'] ) ),
+                                                                esc_attr( sprintf( $button_label, $plugin['name'] ) ),
                                                                 $button_text
                                                         );