WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2018-05-07 16:46:26 +00:00
parent 318ebdf1eb
commit 1d2fd8ef87
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/user.php
View File

@ -836,13 +836,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">
@ -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.
@ -1421,9 +1421,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>';
@ -1463,9 +1463,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>';

8
wp-includes/script-loader.php
View File

@ -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.' ),
)

2
wp-includes/user.php
View File

@ -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 */

2
wp-includes/version.php
View File

@ -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.