Changeset 43175 for trunk

Timestamp:

05/07/2018 04:44:15 PM (7 years ago)

Author:

SergeyBiryukov

Message:

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

Props allendav.
Fixes #43920.

Location:

trunk/src

Files:

• wp-admin/includes/user.php (modified) (6 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)

trunk/src/wp-admin/includes/user.php

@@ -878 +878 @@
     ?>
     <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" />
 
@@ -884 +884 @@
 
         <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>
 
@@ -926 +926 @@
 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' );
 }
 
@@ -1017 +1017 @@
 
         $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
@@ -1463 +1463 @@
                 '">';
 
-            $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>';
@@ -1505 +1505 @@
 
                 ?>
-                <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
 

trunk/src/wp-includes/script-loader.php

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

trunk/src/wp-includes/user.php

@@ -3039 +3039 @@
             break;
         case 'remove_personal_data':
-            $description = __( 'Remove Personal Data' );
+            $description = __( 'Erase Personal Data' );
             break;
         default: