Ticket #43920: 43920.diff

src/wp-admin/includes/user.php

@@ -870 +870 @@
 
         ?>
         <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">
@@ -918 +918 @@
  */
 function _wp_privacy_hook_requests_page() {
         add_submenu_page( 'tools.php', __( 'Export Personal Data' ), __( 'Export Personal Data' ), 'manage_options', 'export_personal_data', '_wp_personal_data_export_page' );
-        add_submenu_page( 'tools.php', __( 'Remove Personal Data' ), __( 'Remove Personal Data' ), 'manage_options', 'remove_personal_data', '_wp_personal_data_removal_page' );
+        add_submenu_page( 'tools.php', __( 'Erase Personal Data' ), __( 'Erase Personal Data' ), 'manage_options', 'remove_personal_data', '_wp_personal_data_removal_page' );
 }
 
 // TODO: move the following classes in new files.
@@ -1009 +1009 @@
                 }
 
                 $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";
@@ -1455 +1455 @@
                                 '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 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 Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
 
                         $remove_data_markup .= '</div>';
 
@@ -1497 +1497 @@
                                         '">';
 
                                 ?>
-                                <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 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 Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
                                 <?php
 
                                 echo '</div>';

src/wp-includes/script-loader.php

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

src/wp-includes/user.php

@@ -3038 +3038 @@
                         $description = __( 'Export Personal Data' );
                         break;
                 case 'remove_personal_data':
-                        $description = __( 'Remove Personal Data' );
+                        $description = __( 'Erase Personal Data' );
                         break;
                 default:
                         /* translators: %s: action name */