Changeset 50931

Timestamp:

05/19/2021 06:09:27 PM (3 years ago)

Author:

davidbaumwald

Message:

I18N: Combine escaping and translation functions.

There are a few instances where two separate functions are used for both escaping and translating output. This change combines the two functions into the appropriate Core helper function.

Props dimadin, SergeyBiryukov.
Fixes #53153.

Location:

trunk/src/wp-admin

Files:

• customize.php (modified) (1 diff)
• includes/class-plugin-installer-skin.php (modified) (2 diffs)
• includes/class-theme-installer-skin.php (modified) (2 diffs)
• includes/class-wp-application-passwords-list-table.php (modified) (1 diff)
• nav-menus.php (modified) (1 diff)

trunk/src/wp-admin/customize.php

@@ -243 +243 @@
 
         <div id="customize-footer-actions" class="wp-full-overlay-footer">
-            <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php echo esc_attr( _x( 'Hide Controls', 'label for hide controls button without length constraints' ) ); ?>">
+            <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php echo esc_attr_x( 'Hide Controls', 'label for hide controls button without length constraints' ); ?>">
                 <span class="collapse-sidebar-arrow"></span>
                 <span class="collapse-sidebar-label"><?php _ex( 'Hide Controls', 'short (~12 characters) label for hide controls button' ); ?></span>

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

@@ -209 +209 @@
         }
 
-        echo '<h2 class="update-from-upload-heading">' . esc_html( __( 'This plugin is already installed.' ) ) . '</h2>';
+        echo '<h2 class="update-from-upload-heading">' . esc_html__( 'This plugin is already installed.' ) . '</h2>';
 
         $this->is_downgrading = version_compare( $current_plugin_data['Version'], $new_plugin_data['Version'], '>' );
@@ -257 +257 @@
         $can_update      = true;
 
-        $blocked_message  = '<p>' . esc_html( __( 'The plugin cannot be updated due to the following:' ) ) . '</p>';
+        $blocked_message  = '<p>' . esc_html__( 'The plugin cannot be updated due to the following:' ) . '</p>';
         $blocked_message .= '<ul class="ul-disc">';
 

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

@@ -222 +222 @@
         }
 
-        echo '<h2 class="update-from-upload-heading">' . esc_html( __( 'This theme is already installed.' ) ) . '</h2>';
+        echo '<h2 class="update-from-upload-heading">' . esc_html__( 'This theme is already installed.' ) . '</h2>';
 
         // Check errors for current theme.
@@ -292 +292 @@
         $can_update      = true;
 
-        $blocked_message  = '<p>' . esc_html( __( 'The theme cannot be updated due to the following:' ) ) . '</p>';
+        $blocked_message  = '<p>' . esc_html__( 'The theme cannot be updated due to the following:' ) . '</p>';
         $blocked_message .= '<ul class="ul-disc">';
 

trunk/src/wp-admin/includes/class-wp-application-passwords-list-table.php

@@ -237 +237 @@
                     printf(
                         '<input type="submit" class="button delete" value="%1$s" aria-label="%2$s">',
-                        esc_attr( __( 'Revoke' ) ),
+                        esc_attr__( 'Revoke' ),
                         /* translators: %s: the application password's given name. */
                         esc_attr( sprintf( __( 'Revoke "%s"' ), '{{ data.name }}' ) )

trunk/src/wp-admin/nav-menus.php

@@ -664 +664 @@
 ?>
 <div class="wrap">
-    <h1 class="wp-heading-inline"><?php echo esc_html( __( 'Menus' ) ); ?></h1>
+    <h1 class="wp-heading-inline"><?php esc_html_e( 'Menus' ); ?></h1>
     <?php
     if ( current_user_can( 'customize' ) ) :