Changeset 31982

Timestamp:

04/02/2015 05:30:13 AM (9 years ago)

Author:

jorbin

Message:

Update aria-label when doing a shiny plugin update

Also updates it again when the shiny plugin update is finished.
Also updates it if the shiny update fails

props mehulkaklotar, afercia
Fixes #31722

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (2 diffs)
• wp-admin/js/updates.js (modified) (7 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -403 +403 @@
                         if ( $status['url'] ) {
                             /* translators: 1: Plugin name and version. */
-                            $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+                            $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
                         }
 
@@ -410 +410 @@
                         if ( $status['url'] ) {
                             /* translators: 1: Plugin name and version */
-                            $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '">' . __( 'Update Now' ) . '</a>';
+                            $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
                         }
 

trunk/src/wp-admin/js/updates.js

@@ -34 +34 @@
      * Filesystem credentials to be packaged along with the request.
      *
-     * @since  4.2.0
+     * @since 4.2.0
      *
      * @var object
@@ -97 +97 @@
     wp.updates.decrementCount = function( upgradeType ) {
         var count,
-            pluginCount,
-            $adminBarUpdateCount = $( '#wp-admin-bar-updates .ab-label' ),
-            $dashboardNavMenuUpdateCount = $( 'a[href="update-core.php"] .update-plugins' ),
-            $pluginsMenuItem = $( '#menu-plugins' );
+            pluginCount,
+            $adminBarUpdateCount = $( '#wp-admin-bar-updates .ab-label' ),
+            $dashboardNavMenuUpdateCount = $( 'a[href="update-core.php"] .update-plugins' ),
+            $pluginsMenuItem = $( '#menu-plugins' );
 
 
@@ -146 +146 @@
      */
     wp.updates.updatePlugin = function( plugin, slug ) {
-        var $message;
+        var $message, name;
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
             $message = $( '[data-slug="' + slug + '"]' ).next().find( '.update-message' );
         } else if ( 'plugin-install' === pagenow ) {
             $message = $( '.plugin-card-' + slug ).find( '.update-now' );
+            name = $message.data( 'name' );
+            $message.attr( 'aria-label', wp.updates.l10n.updatingLabel.replace( '%s', name ) );
         }
 
@@ -199 +201 @@
      */
     wp.updates.updateSuccess = function( response ) {
-        var $updateMessage;
+        var $updateMessage, name, $pluginRow, newText;
         if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
-            var $pluginRow = $( '[data-slug="' + response.slug + '"]' ).first();
+            $pluginRow = $( '[data-slug="' + response.slug + '"]' ).first();
             $updateMessage = $pluginRow.next().find( '.update-message' );
             $pluginRow.addClass( 'updated' ).removeClass( 'update' );
 
             // Update the version number in the row.
-            var newText = $pluginRow.find('.plugin-version-author-uri').html().replace( response.oldVersion, response.newVersion );
+            newText = $pluginRow.find('.plugin-version-author-uri').html().replace( response.oldVersion, response.newVersion );
             $pluginRow.find('.plugin-version-author-uri').html( newText );
 
@@ -214 +216 @@
             $updateMessage = $( '.plugin-card-' + response.slug ).find( '.update-now' );
             $updateMessage.addClass( 'button-disabled' );
+            name = $updateMessage.data( 'name' );
+            $updateMessage.attr( 'aria-label', wp.updates.l10n.updatedLabel.replace( '%s', name ) );
         }
 
@@ -241 +245 @@
      */
     wp.updates.updateError = function( response ) {
-        var $message;
+        var $message, name;
         wp.updates.updateDoneSuccessfully = false;
         if ( response.errorCode && response.errorCode == 'unable_to_connect_to_filesystem' ) {
@@ -251 +255 @@
         } else if ( 'plugin-install' === pagenow ) {
             $message = $( '.plugin-card-' + response.slug ).find( '.update-now' );
+
+            name = $message.data( 'name' );
+            $message.attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', name ) );
         }
         $message.removeClass( 'updating-message' );

trunk/src/wp-includes/script-loader.php

@@ -526 +526 @@
             'ajax_nonce' => wp_create_nonce( 'updates' ),
             'l10n'       => array(
-                'updating'      => __( 'Updating...' ),
-                'updated'       => __( 'Updated!' ),
-                'updateFailed'  => __( 'Update failed.' ),
-                'updatingMsg'   => __( 'Updating... please wait.' ),
-                'updatedMsg'    => __( 'Update completed successfully.' ),
-                'updateCancel'  => __( 'Update canceled' ),
+                'updating'          => __( 'Updating...' ),
+                'updated'           => __( 'Updated!' ),
+                'updateFailed'      => __( 'Update Failed' ),
+                /* translators: Plugin Name */
+                'updatingLabel'     => __( 'Updating %s...' ),
+                /* translators: Plugin Name */
+                'updatedLabel'      => __( '%s updated!' ),
+                /* translators: Plugin Name */
+                'updateFailedLabel' => __( '%s update failed' ),
+                'updatingMsg'       => __( 'Updating... please wait.' ),
+                'updatedMsg'        => __( 'Update completed successfully.' ),
+                'updateCancel'      => __( 'Update canceled.' ),
             )
         ) );