From 1d2fd8ef87b7beeb43bd5d57f2c3922fd00020e7 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 7 May 2018 16:46:26 +0000 Subject: [PATCH] Privacy: Use the terms "erase"/"erasure" instead of "remove"/"removal" for personal data. Props allendav. Merges [43175] to the 4.9 branch. Fixes #43920. Built from https://develop.svn.wordpress.org/branches/4.9@43176 git-svn-id: http://core.svn.wordpress.org/branches/4.9@43005 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/user.php | 22 +++++++++++----------- wp-includes/script-loader.php | 8 ++++---- wp-includes/user.php | 2 +- wp-includes/version.php | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index e627953001..87803e763e 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -836,13 +836,13 @@ function _wp_personal_data_removal_page() { ?>
-

+

-

+

@@ -884,7 +884,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. @@ -975,8 +975,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"; @@ -1421,9 +1421,9 @@ class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table { 'data-nonce="' . esc_attr( $nonce ) . '">'; - $remove_data_markup .= '' . __( 'Force Remove Personal Data' ) . '' . - '' . - ''; + $remove_data_markup .= '' . __( 'Force Erase Personal Data' ) . '' . + '' . + ''; $remove_data_markup .= '
'; @@ -1463,9 +1463,9 @@ class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table { '">'; ?> - - - + + + '; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 7b97035b90..b560fd2451 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -662,10 +662,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/wp-includes/user.php b/wp-includes/user.php index 7e8e43d28c..ae505db28e 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -2960,7 +2960,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 */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 69d267589f..da34b13056 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9.6-beta1-43173'; +$wp_version = '4.9.6-beta1-43176'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.