diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 4e9a836917..3c5c4ae72d 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -877,13 +877,13 @@ function _wp_personal_data_removal_page() { ?>
-

+


-

+

@@ -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 .= '' . __( 'Force Remove Personal Data' ) . '' . - '' . - ''; + $remove_data_markup .= '' . __( 'Force Erase Personal Data' ) . '' . + '' . + ''; $remove_data_markup .= '
'; @@ -1504,9 +1504,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 991c80dc22..12421811b6 100644 --- a/wp-includes/script-loader.php +++ b/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/wp-includes/user.php b/wp-includes/user.php index 93ad81348b..d92e4998e0 100644 --- a/wp-includes/user.php +++ b/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 */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 6beb0572ae..7f7dad7517 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43174'; +$wp_version = '5.0-alpha-43175'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.