Changeset 43176 for branches/4.9/src/wp-admin/includes/user.php

Timestamp:

05/07/2018 04:45:42 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Use the terms "erase"/"erasure" instead of "remove"/"removal" for personal data.

Props allendav.
Merges [43175] to the 4.9 branch.
Fixes #43920.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/user.php (modified) (6 diffs)

branches/4.9/src/wp-admin/includes/user.php

@@ -837 +837 @@
         ?>
         <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" />
 
@@ -843 +843 @@
 
                 <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>
 
@@ -885 +885 @@
 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' );
 }
 
@@ -976 +976 @@
 
                 $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
@@ -1422 +1422 @@
                                 '">';
 
-                        $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>';
@@ -1464 +1464 @@
 
                                 ?>
-                                <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