Changeset 49970

Timestamp:

01/17/2021 05:45:01 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Use more consistent wording for strings related to personal data requests.

This replaces "user privacy" in various error messages with "personal data", for consistency with other existing strings.

Follow-up to [49090].

Props xkon, transl8or.
Fixes #51849.

Location:

trunk/src

Files:

• wp-admin/includes/privacy-tools.php (modified) (16 diffs)
• wp-includes/user.php (modified) (5 diffs)

trunk/src/wp-admin/includes/privacy-tools.php

@@ -21 +21 @@
 
         if ( ! $request || 'user_request' !== $request->post_type ) {
-                return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) );
+                return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
         }
 
@@ -29 +29 @@
                 return $result;
         } elseif ( ! $result ) {
-                return new WP_Error( 'privacy_request_error', __( 'Unable to initiate user privacy confirmation request.' ) );
+                return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation for personal data request.' ) );
         }
 
@@ -50 +50 @@
 
         if ( ! $request ) {
-                return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) );
+                return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
         }
 
@@ -105 +105 @@
                                                 'action_type',
                                                 'action_type',
-                                                __( 'Invalid user privacy action.' ),
+                                                __( 'Invalid personal data action.' ),
                                                 'error'
                                         );
@@ -117 +117 @@
                                                 'action_type',
                                                 'action_type',
-                                                __( 'Invalid user privacy action.' ),
+                                                __( 'Invalid personal data action.' ),
                                                 'error'
                                         );
@@ -298 +298 @@
 function wp_privacy_generate_personal_data_export_file( $request_id ) {
         if ( ! class_exists( 'ZipArchive' ) ) {
-                wp_send_json_error( __( 'Unable to generate user privacy export file. ZipArchive not available.' ) );
+                wp_send_json_error( __( 'Unable to generate personal data export file. ZipArchive not available.' ) );
         }
 
@@ -305 +305 @@
 
         if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-                wp_send_json_error( __( 'Invalid request ID when generating user privacy export file.' ) );
+                wp_send_json_error( __( 'Invalid request ID when generating personal data export file.' ) );
         }
 
@@ -311 +311 @@
 
         if ( ! is_email( $email_address ) ) {
-                wp_send_json_error( __( 'Invalid email address when generating user privacy export file.' ) );
+                wp_send_json_error( __( 'Invalid email address when generating personal data export file.' ) );
         }
 
@@ -319 +319 @@
 
         if ( ! wp_mkdir_p( $exports_dir ) ) {
-                wp_send_json_error( __( 'Unable to create user privacy export folder.' ) );
+                wp_send_json_error( __( 'Unable to create personal data export folder.' ) );
         }
 
@@ -327 +327 @@
                 $file = fopen( $index_pathname, 'w' );
                 if ( false === $file ) {
-                        wp_send_json_error( __( 'Unable to protect user privacy export folder from browsing.' ) );
+                        wp_send_json_error( __( 'Unable to protect personal data export folder from browsing.' ) );
                 }
                 fwrite( $file, '<!-- Silence is golden. -->' );
@@ -396 +396 @@
 
         if ( false === $file ) {
-                wp_send_json_error( __( 'Unable to open user privacy export file (JSON report) for writing.' ) );
+                wp_send_json_error( __( 'Unable to open personal data export file (JSON report) for writing.' ) );
         }
 
@@ -411 +411 @@
 
         if ( false === $file ) {
-                wp_send_json_error( __( 'Unable to open user privacy export file (HTML report) for writing.' ) );
+                wp_send_json_error( __( 'Unable to open personal data export (HTML report) for writing.' ) );
         }
 
@@ -505 +505 @@
         if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
                 if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) {
-                        $error = __( 'Unable to add data to user privacy export file (JSON format).' );
+                        $error = __( 'Unable to archive the personal data export file (JSON format).' );
                 }
 
                 if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
-                        $error = __( 'Unable to add data to user privacy export file (HTML format).' );
+                        $error = __( 'Unable to archive the personal data export file (HTML format).' );
                 }
 
@@ -530 +530 @@
                 }
         } else {
-                $error = __( 'Unable to open user privacy export file (archive) for writing.' );
+                $error = __( 'Unable to open personal data export file (archive) for writing.' );
         }
 
@@ -759 +759 @@
 
         if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-                wp_send_json_error( __( 'Invalid request ID when merging user privacy exporter data.' ) );
+                wp_send_json_error( __( 'Invalid request ID when merging personal data to export.' ) );
         }
 
@@ -910 +910 @@
 
         if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-                wp_send_json_error( __( 'Invalid request ID when processing user privacy eraser data.' ) );
+                wp_send_json_error( __( 'Invalid request ID when processing personal data to erase.' ) );
         }
 

trunk/src/wp-includes/user.php

@@ -3124 +3124 @@
 
 /**
- * Get all user privacy request types.
+ * Get all personal data request types.
  *
  * @since 4.9.6
@@ -3806 +3806 @@
 
         if ( $requests_query->found_posts ) {
-                return new WP_Error( 'duplicate_request', __( 'An incomplete user privacy request for this email address already exists.' ) );
+                return new WP_Error( 'duplicate_request', __( 'An incomplete personal data request for this email address already exists.' ) );
         }
 
@@ -3874 +3874 @@
 
         if ( ! $request ) {
-                return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) );
+                return new WP_Error( 'invalid_request', __( 'Invalid personal data request.' ) );
         }
 
@@ -4062 +4062 @@
 
         if ( ! $request || ! $saved_key || ! $key_request_time ) {
-                return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) );
+                return new WP_Error( 'invalid_request', __( 'Invalid personal data request.' ) );
         }
 
         if ( ! in_array( $request->status, array( 'request-pending', 'request-failed' ), true ) ) {
-                return new WP_Error( 'expired_request', __( 'This user privacy request has expired.' ) );
+                return new WP_Error( 'expired_request', __( 'This personal data request has expired.' ) );
         }
 
         if ( empty( $key ) ) {
-                return new WP_Error( 'missing_key', __( 'This user privacy request is missing the confirmation key.' ) );
+                return new WP_Error( 'missing_key', __( 'The confirmation key is missing from this personal data request.' ) );
         }
 
@@ -4089 +4089 @@
 
         if ( ! $wp_hasher->CheckPassword( $key, $saved_key ) ) {
-                return new WP_Error( 'invalid_key', __( 'This user privacy request confirmation key is invalid.' ) );
+                return new WP_Error( 'invalid_key', __( 'The confirmation key is invalid for this personal data request.' ) );
         }
 
         if ( ! $expiration_time || time() > $expiration_time ) {
-                return new WP_Error( 'expired_key', __( 'This user privacy request confirmation key has expired.' ) );
+                return new WP_Error( 'expired_key', __( 'The confirmation key has expired for this personal data request.' ) );
         }