Changeset 49090 for trunk/src/wp-admin/includes/privacy-tools.php

Timestamp:

10/04/2020 03:21:38 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Improve clarity of privacy error strings.

Primarily this adds "user privacy" to the strings for privacy requests, so they are more easily distinguished from other system actions within logs.

Props garrett-eclipse, carike, birgire.
Fixes #51351.

File:

• trunk/src/wp-admin/includes/privacy-tools.php (modified) (16 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 request.' ) );
+        return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) );
     }
 
@@ -29 +29 @@
         return $result;
     } elseif ( ! $result ) {
-        return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation request.' ) );
+        return new WP_Error( 'privacy_request_error', __( 'Unable to initiate user privacy confirmation request.' ) );
     }
 
@@ -50 +50 @@
 
     if ( ! $request ) {
-        return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
+        return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) );
     }
 
@@ -105 +105 @@
                         'action_type',
                         'action_type',
-                        __( 'Invalid action.' ),
+                        __( 'Invalid user privacy action.' ),
                         'error'
                     );
@@ -117 +117 @@
                         'action_type',
                         'action_type',
-                        __( 'Invalid action.' ),
+                        __( 'Invalid user privacy 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 export file. ZipArchive not available.' ) );
+        wp_send_json_error( __( 'Unable to generate user privacy export file. ZipArchive not available.' ) );
     }
 
@@ -305 +305 @@
 
     if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-        wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
+        wp_send_json_error( __( 'Invalid request ID when generating user privacy export file.' ) );
     }
 
@@ -311 +311 @@
 
     if ( ! is_email( $email_address ) ) {
-        wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
+        wp_send_json_error( __( 'Invalid email address when generating user privacy export file.' ) );
     }
 
@@ -319 +319 @@
 
     if ( ! wp_mkdir_p( $exports_dir ) ) {
-        wp_send_json_error( __( 'Unable to create export folder.' ) );
+        wp_send_json_error( __( 'Unable to create user privacy export folder.' ) );
     }
 
@@ -327 +327 @@
         $file = fopen( $index_pathname, 'w' );
         if ( false === $file ) {
-            wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
+            wp_send_json_error( __( 'Unable to protect user privacy export folder from browsing.' ) );
         }
         fwrite( $file, '<!-- Silence is golden. -->' );
@@ -396 +396 @@
 
     if ( false === $file ) {
-        wp_send_json_error( __( 'Unable to open export file (JSON report) for writing.' ) );
+        wp_send_json_error( __( 'Unable to open user privacy export file (JSON report) for writing.' ) );
     }
 
@@ -411 +411 @@
 
     if ( false === $file ) {
-        wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
+        wp_send_json_error( __( 'Unable to open user privacy export file (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 JSON file.' );
+            $error = __( 'Unable to add data to user privacy export file (JSON format).' );
         }
 
         if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
-            $error = __( 'Unable to add data to HTML file.' );
+            $error = __( 'Unable to add data to user privacy export file (HTML format).' );
         }
 
@@ -530 +530 @@
         }
     } else {
-        $error = __( 'Unable to open export file (archive) for writing.' );
+        $error = __( 'Unable to open user privacy export file (archive) for writing.' );
     }
 
@@ -759 +759 @@
 
     if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-        wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
+        wp_send_json_error( __( 'Invalid request ID when merging user privacy exporter data.' ) );
     }
 
@@ -910 +910 @@
 
     if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-        wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) );
+        wp_send_json_error( __( 'Invalid request ID when processing user privacy eraser data.' ) );
     }