From f47a74a428ff0cfe164dcb6a047813f7575aa70e Mon Sep 17 00:00:00 2001
From: davidbaumwald <davidbaumwald@git.wordpress.org>
Date: Wed, 19 May 2021 18:10:59 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@50931


git-svn-id: http://core.svn.wordpress.org/trunk@50540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/customize.php                                        | 2 +-
 wp-admin/includes/class-plugin-installer-skin.php             | 4 ++--
 wp-admin/includes/class-theme-installer-skin.php              | 4 ++--
 .../includes/class-wp-application-passwords-list-table.php    | 2 +-
 wp-admin/nav-menus.php                                        | 2 +-
 wp-includes/version.php                                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index 51335829f0..f2eb07e9b5 100644
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -242,7 +242,7 @@ do_action( 'customize_controls_head' );
 		</div>
 
 		<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>
 			</button>
diff --git a/wp-admin/includes/class-plugin-installer-skin.php b/wp-admin/includes/class-plugin-installer-skin.php
index 1154a81004..e36b2d2931 100644
--- a/wp-admin/includes/class-plugin-installer-skin.php
+++ b/wp-admin/includes/class-plugin-installer-skin.php
@@ -208,7 +208,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 			return false;
 		}
 
-		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'], '>' );
 
@@ -256,7 +256,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 		$install_actions = array();
 		$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">';
 
 		$requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php
index b9eed856d8..1af614d0b4 100644
--- a/wp-admin/includes/class-theme-installer-skin.php
+++ b/wp-admin/includes/class-theme-installer-skin.php
@@ -221,7 +221,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 			return false;
 		}
 
-		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.
 		if ( is_wp_error( $current_theme_data->errors() ) ) {
@@ -291,7 +291,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 		$install_actions = array();
 		$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">';
 
 		$requires_php = isset( $new_theme_data['RequiresPHP'] ) ? $new_theme_data['RequiresPHP'] : null;
diff --git a/wp-admin/includes/class-wp-application-passwords-list-table.php b/wp-admin/includes/class-wp-application-passwords-list-table.php
index d1c128b50a..c8055e00e5 100644
--- a/wp-admin/includes/class-wp-application-passwords-list-table.php
+++ b/wp-admin/includes/class-wp-application-passwords-list-table.php
@@ -236,7 +236,7 @@ class WP_Application_Passwords_List_Table extends WP_List_Table {
 				case 'revoke':
 					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 }}' ) )
 					);
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index f224964553..b08faf702a 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -663,7 +663,7 @@ get_current_screen()->set_help_sidebar(
 require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
 <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' ) ) :
 		$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b7496e67ed..2fc8f8c119 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-50930';
+$wp_version = '5.8-alpha-50931';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.