From 4104f92d7f6d6ddfa62d354721bb6baeb1b14b23 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 17 Jan 2021 17:46:06 +0000 Subject: [PATCH] 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. Built from https://develop.svn.wordpress.org/trunk@49970 git-svn-id: http://core.svn.wordpress.org/trunk@49671 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/privacy-tools.php | 34 ++++++++++++++--------------- wp-includes/user.php | 16 +++++++------- wp-includes/version.php | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/wp-admin/includes/privacy-tools.php b/wp-admin/includes/privacy-tools.php index 4df1fb3343..629302fc2d 100644 --- a/wp-admin/includes/privacy-tools.php +++ b/wp-admin/includes/privacy-tools.php @@ -20,7 +20,7 @@ function _wp_privacy_resend_request( $request_id ) { $request = get_post( $request_id ); 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.' ) ); } $result = wp_send_user_request( $request_id ); @@ -28,7 +28,7 @@ function _wp_privacy_resend_request( $request_id ) { if ( is_wp_error( $result ) ) { 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.' ) ); } return true; @@ -49,7 +49,7 @@ function _wp_privacy_completed_request( $request_id ) { $request = wp_get_user_request( $request_id ); if ( ! $request ) { - return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) ); + return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) ); } update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() ); @@ -104,7 +104,7 @@ function _wp_personal_data_handle_actions() { add_settings_error( 'action_type', 'action_type', - __( 'Invalid user privacy action.' ), + __( 'Invalid personal data action.' ), 'error' ); } @@ -116,7 +116,7 @@ function _wp_personal_data_handle_actions() { add_settings_error( 'action_type', 'action_type', - __( 'Invalid user privacy action.' ), + __( 'Invalid personal data action.' ), 'error' ); } @@ -297,20 +297,20 @@ function wp_privacy_generate_personal_data_export_group_html( $group_data, $grou */ 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.' ) ); } // Get the request. $request = wp_get_user_request( $request_id ); 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.' ) ); } $email_address = $request->email; 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.' ) ); } // Create the exports folder if needed. @@ -318,7 +318,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { $exports_url = wp_privacy_exports_url(); 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.' ) ); } // Protect export folder from browsing. @@ -326,7 +326,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { if ( ! file_exists( $index_pathname ) ) { $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, '' ); fclose( $file ); @@ -395,7 +395,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { $file = fopen( $json_report_pathname, 'w' ); 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.' ) ); } fwrite( $file, '{' ); @@ -410,7 +410,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { $file = fopen( $html_report_pathname, 'w' ); 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.' ) ); } fwrite( $file, "\n" ); @@ -504,11 +504,11 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { $zip = new ZipArchive; 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).' ); } $zip->close(); @@ -529,7 +529,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id, $json_report_pathname ); } } else { - $error = __( 'Unable to open user privacy export file (archive) for writing.' ); + $error = __( 'Unable to open personal data export file (archive) for writing.' ); } // Remove the JSON file. @@ -758,7 +758,7 @@ function wp_privacy_process_personal_data_export_page( $response, $exporter_inde $request = wp_get_user_request( $request_id ); 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.' ) ); } $export_data = array(); @@ -909,7 +909,7 @@ function wp_privacy_process_personal_data_erasure_page( $response, $eraser_index $request = wp_get_user_request( $request_id ); 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.' ) ); } /** This filter is documented in wp-admin/includes/ajax-actions.php */ diff --git a/wp-includes/user.php b/wp-includes/user.php index f88403bb0c..b4a7d36b3f 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -3123,7 +3123,7 @@ function new_user_email_admin_notice() { } /** - * Get all user privacy request types. + * Get all personal data request types. * * @since 4.9.6 * @access private @@ -3805,7 +3805,7 @@ function wp_create_user_request( $email_address = '', $action_name = '', $reques ); 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.' ) ); } $request_id = wp_insert_post( @@ -3873,7 +3873,7 @@ function wp_send_user_request( $request_id ) { $request = wp_get_user_request( $request_id ); if ( ! $request ) { - return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) ); + return new WP_Error( 'invalid_request', __( 'Invalid personal data request.' ) ); } // Localize message content for user; fallback to site default for visitors. @@ -4061,15 +4061,15 @@ function wp_validate_user_request_key( $request_id, $key ) { $key_request_time = $request->modified_timestamp; 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.' ) ); } if ( empty( $wp_hasher ) ) { @@ -4088,11 +4088,11 @@ function wp_validate_user_request_key( $request_id, $key ) { $expiration_time = $key_request_time + $expiration_duration; 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.' ) ); } return true; diff --git a/wp-includes/version.php b/wp-includes/version.php index aa96511487..75c6e9e00b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-49969'; +$wp_version = '5.7-alpha-49970'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.