Changeset 50705

Timestamp:

04/13/2021 05:36:39 PM (4 years ago)

Author:

davidbaumwald

Message:

I18N: Add context to strings when updating a plugin or theme with a ZIP package.

After [48390], plugins and themes can be updated with an uploaded ZIP file. Strings were added for comparing the "current" and "uploaded" versions of a plugin or theme, but lacked context for each as to the object being referenced. This change adds a plugin or theme context to each of these strings for disambiguation.

Props dimadin, SergeyBiryukov.
Fixes #53017.

Location:

trunk/src/wp-admin/includes

Files:

• class-plugin-installer-skin.php (modified) (2 diffs)
• class-theme-installer-skin.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-plugin-installer-skin.php

@@ -222 +222 @@
 
         $table  = '<table class="update-from-upload-comparison"><tbody>';
-        $table .= '<tr><th></th><th>' . esc_html( __( 'Current' ) ) . '</th>';
-        $table .= '<th>' . esc_html( __( 'Uploaded' ) ) . '</th></tr>';
+        $table .= '<tr><th></th><th>' . esc_html_x( 'Current', 'plugin' ) . '</th>';
+        $table .= '<th>' . esc_html_x( 'Uploaded', 'plugin' ) . '</th></tr>';
 
         $is_same_plugin = true; // Let's consider only these rows.
@@ -311 +311 @@
                 '<a class="button button-primary update-from-upload-overwrite" href="%s" target="_parent">%s</a>',
                 wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'plugin-upload' ),
-                __( 'Replace current with uploaded' )
+                _x( 'Replace current with uploaded', 'plugin' )
             );
         } else {

trunk/src/wp-admin/includes/class-theme-installer-skin.php

@@ -246 +246 @@
 
         $table  = '<table class="update-from-upload-comparison"><tbody>';
-        $table .= '<tr><th></th><th>' . esc_html( __( 'Current' ) ) . '</th><th>' . esc_html( __( 'Uploaded' ) ) . '</th></tr>';
+        $table .= '<tr><th></th><th>' . esc_html_x( 'Current', 'theme' ) . '</th><th>' . esc_html_x( 'Uploaded', 'theme' ) . '</th></tr>';
 
         $is_same_theme = true; // Let's consider only these rows.
@@ -346 +346 @@
                 '<a class="button button-primary update-from-upload-overwrite" href="%s" target="_parent">%s</a>',
                 wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'theme-upload' ),
-                __( 'Replace current with uploaded' )
+                _x( 'Replace current with uploaded', 'theme' )
             );
         } else {