From 9ca9b27110b53692cf66c0d7bc92580b56361dbd Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 7 May 2018 16:44:15 +0000
Subject: [PATCH] Privacy: Use the terms "erase"/"erasure" instead of
 "remove"/"removal" for personal data.

Props allendav.
Fixes #43920.

git-svn-id: https://develop.svn.wordpress.org/trunk@43175 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/user.php    | 22 +++++++++++-----------
 src/wp-includes/script-loader.php |  8 ++++----
 src/wp-includes/user.php          |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index 4e9a836917..3c5c4ae72d 100644
--- a/src/wp-admin/includes/user.php
+++ b/src/wp-admin/includes/user.php
@@ -877,13 +877,13 @@ function _wp_personal_data_removal_page() {
 
 	?>
 	<div class="wrap nosubsub">
-		<h1><?php esc_html_e( 'Remove Personal Data' ); ?></h1>
+		<h1><?php esc_html_e( 'Erase Personal Data' ); ?></h1>
 		<hr class="wp-header-end" />
 
 		<?php settings_errors(); ?>
 
 		<form method="post" class="wp-privacy-request-form">
-			<h2><?php esc_html_e( 'Add Data Removal Request' ); ?></h2>
+			<h2><?php esc_html_e( 'Add Data Erasure Request' ); ?></h2>
 			<p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
 
 			<div class="wp-privacy-request-form-field">
@@ -925,7 +925,7 @@ function _wp_personal_data_removal_page() {
  */
 function _wp_privacy_hook_requests_page() {
 	add_submenu_page( 'tools.php', __( 'Export Personal Data' ), __( 'Export Personal Data' ), 'export_others_personal_data', 'export_personal_data', '_wp_personal_data_export_page' );
-	add_submenu_page( 'tools.php', __( 'Remove Personal Data' ), __( 'Remove Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
+	add_submenu_page( 'tools.php', __( 'Erase Personal Data' ), __( 'Erase Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
 }
 
 // TODO: move the following classes in new files.
@@ -1016,8 +1016,8 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
 		}
 
 		$query = "
-			SELECT post_status, COUNT( * ) AS num_posts 
-			FROM {$wpdb->posts} 
+			SELECT post_status, COUNT( * ) AS num_posts
+			FROM {$wpdb->posts}
 			WHERE post_type = %s
 			AND post_name = %s
 			GROUP BY post_status";
@@ -1462,9 +1462,9 @@ class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table {
 				'data-nonce="' . esc_attr( $nonce ) .
 				'">';
 
-			$remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
-				'<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
-				'<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
+			$remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Erase Personal Data' ) . '</a></span>' .
+				'<span style="display:none" class="remove_personal_data_processing" >' . __( 'Erasing Data...' ) . '</span>' .
+				'<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Erase has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
 
 			$remove_data_markup .= '</div>';
 
@@ -1504,9 +1504,9 @@ class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table {
 					'">';
 
 				?>
-				<span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
-				<span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
-				<span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
+				<span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Erase Personal Data' ); ?></a></span>
+				<span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Erasing Data...' ); ?></span>
+				<span style="display:none" class="remove_personal_data_failed"><?php _e( 'Erasing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
 				<?php
 
 				echo '</div>';
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 991c80dc22..12421811b6 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -712,10 +712,10 @@ function wp_default_scripts( &$scripts ) {
 		did_action( 'init' ) && $scripts->localize(
 			'xfn', 'privacyToolsL10n', array(
 				'noDataFound'     => __( 'No personal data was found for this user.' ),
-				'foundAndRemoved' => __( 'All of the personal data found for this user was removed.' ),
-				'noneRemoved'     => __( 'Personal data was found for this user but was not removed.' ),
-				'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not removed.' ),
-				'removalError'    => __( 'An error occurred while attempting to find and remove personal data.' ),
+				'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
+				'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
+				'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
+				'removalError'    => __( 'An error occurred while attempting to find and erase personal data.' ),
 				'noExportFile'    => __( 'No personal data export file was generated.' ),
 				'exportError'     => __( 'An error occurred while attempting to export personal data.' ),
 			)
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 93ad81348b..d92e4998e0 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -3038,7 +3038,7 @@ function wp_user_request_action_description( $action_name ) {
 			$description = __( 'Export Personal Data' );
 			break;
 		case 'remove_personal_data':
-			$description = __( 'Remove Personal Data' );
+			$description = __( 'Erase Personal Data' );
 			break;
 		default:
 			/* translators: %s: action name */