Ticket #50710: 50710.patch

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

@@ -528 +528 @@
                                                                         esc_attr( $plugin['slug'] ),
                                                                         esc_url( $status['url'] ),
                                                                         /* translators: %s: Plugin name and version. */
-                                                                        esc_attr( sprintf( __( 'Install %s now' ), $name ) ),
+                                                                        esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $name ) ),
                                                                         esc_attr( $name ),
                                                                         __( 'Install Now' )
                                                                 );
@@ -550 +550 @@
                                                                         esc_attr( $plugin['slug'] ),
                                                                         esc_url( $status['url'] ),
                                                                         /* translators: %s: Plugin name and version. */
-                                                                        esc_attr( sprintf( __( 'Update %s now' ), $name ) ),
+                                                                        esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $name ) ),
                                                                         esc_attr( $name ),
                                                                         __( 'Update Now' )
                                                                 );

wp-admin/includes/class-wp-theme-install-list-table.php

@@ -323 +323 @@
                                         '<a class="install-now" href="%s" title="%s">%s</a>',
                                         esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
                                         /* translators: %s: Theme name. */
-                                        esc_attr( sprintf( __( 'Install %s' ), $name ) ),
+                                        esc_attr( sprintf( _x( 'Install %s', 'theme' ), $name ) ),
                                         __( 'Install Now' )
                                 );
                                 break;

wp-admin/includes/deprecated.php

@@ -1379 +1379 @@
                 echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
                         '&nbsp;<a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
                         /* translators: %s: Plugin name. */
-                        esc_attr( sprintf( __( 'Install %s' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
+                        esc_attr( sprintf( _x( 'Install %s', 'plugin' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
 
                 $feed->__destruct();
                 unset( $feed );

wp-admin/includes/theme.php

@@ -240 +240 @@
                                         sprintf(
                                                 'aria-label="%s" id="update-theme" data-slug="%s"',
                                                 /* translators: %s: Theme name. */
-                                                esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ),
+                                                esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme_name ) ),
                                                 $stylesheet
                                         )
                                 );

wp-admin/includes/update.php

@@ -509 +509 @@
                                         sprintf(
                                                 'class="update-link" aria-label="%s"',
                                                 /* translators: %s: Plugin name. */
-                                                esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
+                                                esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $plugin_name ) )
                                         )
                                 );
                         } else {
@@ -694 +694 @@
                         sprintf(
                                 'class="update-link" aria-label="%s"',
                                 /* translators: %s: Theme name. */
-                                esc_attr( sprintf( __( 'Update %s now' ), $theme['Name'] ) )
+                                esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme['Name'] ) )
                         )
                 );
         }

wp-admin/js/updates.js

@@ -813 +813 @@
                                 'aria-label',
                                 sprintf(
                                         /* translators: %s: Plugin name. */
-                                         _x( 'Install %s now', 'plugin' ),
-                                         pluginName
+                                        _x( 'Install %s now', 'plugin' ),
+                                        pluginName
                                 )
                         )
                         .text( __( 'Install Now' ) );

wp-admin/theme-install.php

@@ -323 +323 @@
                                 <# if ( data.compatible_wp && data.compatible_php ) { #>
                                         <?php
                                         /* translators: %s: Theme name. */
-                                        $aria_label = sprintf( __( 'Install %s' ), '{{ data.name }}' );
+                                        $aria_label = sprintf( _x( 'Install %s', 'theme' ), '{{ data.name }}' );
                                         ?>
                                         <a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
                                         <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
@@ -330 +330 @@
                                 <# } else { #>
                                         <?php
                                         /* translators: %s: Theme name. */
-                                        $aria_label = sprintf( __( 'Cannot Install %s' ), '{{ data.name }}' );
+                                        $aria_label = sprintf( _x( 'Cannot Install %s', 'theme' ), '{{ data.name }}' );
                                         ?>
                                         <a class="button button-primary disabled" data-name="{{ data.name }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Install', 'theme' ); ?></a>
                                         <button class="button disabled"><?php _e( 'Preview' ); ?></button>