WordPress.org

Make WordPress Core


Ignore:
Timestamp:
10/04/2020 03:21:38 AM (9 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/privacy-tools.php

    r49026 r49090  
    2121
    2222    if ( ! $request || 'user_request' !== $request->post_type ) {
    23         return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
     23        return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) );
    2424    }
    2525
     
    2929        return $result;
    3030    } elseif ( ! $result ) {
    31         return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation request.' ) );
     31        return new WP_Error( 'privacy_request_error', __( 'Unable to initiate user privacy confirmation request.' ) );
    3232    }
    3333
     
    5050
    5151    if ( ! $request ) {
    52         return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
     52        return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) );
    5353    }
    5454
     
    105105                        'action_type',
    106106                        'action_type',
    107                         __( 'Invalid action.' ),
     107                        __( 'Invalid user privacy action.' ),
    108108                        'error'
    109109                    );
     
    117117                        'action_type',
    118118                        'action_type',
    119                         __( 'Invalid action.' ),
     119                        __( 'Invalid user privacy action.' ),
    120120                        'error'
    121121                    );
     
    298298function wp_privacy_generate_personal_data_export_file( $request_id ) {
    299299    if ( ! class_exists( 'ZipArchive' ) ) {
    300         wp_send_json_error( __( 'Unable to generate export file. ZipArchive not available.' ) );
     300        wp_send_json_error( __( 'Unable to generate user privacy export file. ZipArchive not available.' ) );
    301301    }
    302302
     
    305305
    306306    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    307         wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
     307        wp_send_json_error( __( 'Invalid request ID when generating user privacy export file.' ) );
    308308    }
    309309
     
    311311
    312312    if ( ! is_email( $email_address ) ) {
    313         wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
     313        wp_send_json_error( __( 'Invalid email address when generating user privacy export file.' ) );
    314314    }
    315315
     
    319319
    320320    if ( ! wp_mkdir_p( $exports_dir ) ) {
    321         wp_send_json_error( __( 'Unable to create export folder.' ) );
     321        wp_send_json_error( __( 'Unable to create user privacy export folder.' ) );
    322322    }
    323323
     
    327327        $file = fopen( $index_pathname, 'w' );
    328328        if ( false === $file ) {
    329             wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
     329            wp_send_json_error( __( 'Unable to protect user privacy export folder from browsing.' ) );
    330330        }
    331331        fwrite( $file, '<!-- Silence is golden. -->' );
     
    396396
    397397    if ( false === $file ) {
    398         wp_send_json_error( __( 'Unable to open export file (JSON report) for writing.' ) );
     398        wp_send_json_error( __( 'Unable to open user privacy export file (JSON report) for writing.' ) );
    399399    }
    400400
     
    411411
    412412    if ( false === $file ) {
    413         wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
     413        wp_send_json_error( __( 'Unable to open user privacy export file (HTML report) for writing.' ) );
    414414    }
    415415
     
    505505    if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
    506506        if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) {
    507             $error = __( 'Unable to add data to JSON file.' );
     507            $error = __( 'Unable to add data to user privacy export file (JSON format).' );
    508508        }
    509509
    510510        if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
    511             $error = __( 'Unable to add data to HTML file.' );
     511            $error = __( 'Unable to add data to user privacy export file (HTML format).' );
    512512        }
    513513
     
    530530        }
    531531    } else {
    532         $error = __( 'Unable to open export file (archive) for writing.' );
     532        $error = __( 'Unable to open user privacy export file (archive) for writing.' );
    533533    }
    534534
     
    759759
    760760    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    761         wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
     761        wp_send_json_error( __( 'Invalid request ID when merging user privacy exporter data.' ) );
    762762    }
    763763
     
    910910
    911911    if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
    912         wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) );
     912        wp_send_json_error( __( 'Invalid request ID when processing user privacy eraser data.' ) );
    913913    }
    914914
Note: See TracChangeset for help on using the changeset viewer.