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:
parent
318ebdf1eb
commit
1d2fd8ef87
|
@ -836,13 +836,13 @@ function _wp_personal_data_removal_page() {
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<div class="wrap nosubsub">
|
<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" />
|
<hr class="wp-header-end" />
|
||||||
|
|
||||||
<?php settings_errors(); ?>
|
<?php settings_errors(); ?>
|
||||||
|
|
||||||
<form method="post" class="wp-privacy-request-form">
|
<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>
|
<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">
|
<div class="wp-privacy-request-form-field">
|
||||||
|
@ -884,7 +884,7 @@ function _wp_personal_data_removal_page() {
|
||||||
*/
|
*/
|
||||||
function _wp_privacy_hook_requests_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', __( '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.
|
// TODO: move the following classes in new files.
|
||||||
|
@ -975,8 +975,8 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = "
|
$query = "
|
||||||
SELECT post_status, COUNT( * ) AS num_posts
|
SELECT post_status, COUNT( * ) AS num_posts
|
||||||
FROM {$wpdb->posts}
|
FROM {$wpdb->posts}
|
||||||
WHERE post_type = %s
|
WHERE post_type = %s
|
||||||
AND post_name = %s
|
AND post_name = %s
|
||||||
GROUP BY post_status";
|
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 ) .
|
'data-nonce="' . esc_attr( $nonce ) .
|
||||||
'">';
|
'">';
|
||||||
|
|
||||||
$remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</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" >' . __( 'Removing Data...' ) . '</span>' .
|
'<span style="display:none" class="remove_personal_data_processing" >' . __( 'Erasing Data...' ) . '</span>' .
|
||||||
'<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
|
'<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Erase has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
|
||||||
|
|
||||||
$remove_data_markup .= '</div>';
|
$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 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( 'Removing Data...' ); ?></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( 'Removing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></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
|
<?php
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|
|
@ -662,10 +662,10 @@ function wp_default_scripts( &$scripts ) {
|
||||||
did_action( 'init' ) && $scripts->localize(
|
did_action( 'init' ) && $scripts->localize(
|
||||||
'xfn', 'privacyToolsL10n', array(
|
'xfn', 'privacyToolsL10n', array(
|
||||||
'noDataFound' => __( 'No personal data was found for this user.' ),
|
'noDataFound' => __( 'No personal data was found for this user.' ),
|
||||||
'foundAndRemoved' => __( 'All of the personal data found for this user was removed.' ),
|
'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
|
||||||
'noneRemoved' => __( 'Personal data was found for this user but was not removed.' ),
|
'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 removed.' ),
|
'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 remove personal data.' ),
|
'removalError' => __( 'An error occurred while attempting to find and erase personal data.' ),
|
||||||
'noExportFile' => __( 'No personal data export file was generated.' ),
|
'noExportFile' => __( 'No personal data export file was generated.' ),
|
||||||
'exportError' => __( 'An error occurred while attempting to export personal data.' ),
|
'exportError' => __( 'An error occurred while attempting to export personal data.' ),
|
||||||
)
|
)
|
||||||
|
|
|
@ -2960,7 +2960,7 @@ function wp_user_request_action_description( $action_name ) {
|
||||||
$description = __( 'Export Personal Data' );
|
$description = __( 'Export Personal Data' );
|
||||||
break;
|
break;
|
||||||
case 'remove_personal_data':
|
case 'remove_personal_data':
|
||||||
$description = __( 'Remove Personal Data' );
|
$description = __( 'Erase Personal Data' );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* translators: %s: action name */
|
/* translators: %s: action name */
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @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.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue