WordPress.org

Make WordPress Core

Changeset 43175


Ignore:
Timestamp:
05/07/2018 04:44:15 PM (17 months 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:
3 edited

Legend:

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

    r43172 r43175  
    878878    ?>
    879879    <div class="wrap nosubsub">
    880         <h1><?php esc_html_e( 'Remove Personal Data' ); ?></h1>
     880        <h1><?php esc_html_e( 'Erase Personal Data' ); ?></h1>
    881881        <hr class="wp-header-end" />
    882882
     
    884884
    885885        <form method="post" class="wp-privacy-request-form">
    886             <h2><?php esc_html_e( 'Add Data Removal Request' ); ?></h2>
     886            <h2><?php esc_html_e( 'Add Data Erasure Request' ); ?></h2>
    887887            <p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
    888888
     
    926926function _wp_privacy_hook_requests_page() {
    927927    add_submenu_page( 'tools.php', __( 'Export Personal Data' ), __( 'Export Personal Data' ), 'export_others_personal_data', 'export_personal_data', '_wp_personal_data_export_page' );
    928     add_submenu_page( 'tools.php', __( 'Remove Personal Data' ), __( 'Remove Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
     928    add_submenu_page( 'tools.php', __( 'Erase Personal Data' ), __( 'Erase Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
    929929}
    930930
     
    10171017
    10181018        $query = "
    1019             SELECT post_status, COUNT( * ) AS num_posts 
    1020             FROM {$wpdb->posts} 
     1019            SELECT post_status, COUNT( * ) AS num_posts
     1020            FROM {$wpdb->posts}
    10211021            WHERE post_type = %s
    10221022            AND post_name = %s
     
    14631463                '">';
    14641464
    1465             $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
    1466                 '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
    1467                 '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1465            $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Erase Personal Data' ) . '</a></span>' .
     1466                '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Erasing Data...' ) . '</span>' .
     1467                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Erase has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    14681468
    14691469            $remove_data_markup .= '</div>';
     
    15051505
    15061506                ?>
    1507                 <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
    1508                 <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
    1509                 <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1507                <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Erase Personal Data' ); ?></a></span>
     1508                <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Erasing Data...' ); ?></span>
     1509                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Erasing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    15101510                <?php
    15111511
  • trunk/src/wp-includes/script-loader.php

    r43012 r43175  
    713713            'xfn', 'privacyToolsL10n', array(
    714714                'noDataFound'     => __( 'No personal data was found for this user.' ),
    715                 'foundAndRemoved' => __( 'All of the personal data found for this user was removed.' ),
    716                 'noneRemoved'     => __( 'Personal data was found for this user but was not removed.' ),
    717                 'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not removed.' ),
    718                 'removalError'    => __( 'An error occurred while attempting to find and remove personal data.' ),
     715                'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
     716                'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
     717                'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
     718                'removalError'    => __( 'An error occurred while attempting to find and erase personal data.' ),
    719719                'noExportFile'    => __( 'No personal data export file was generated.' ),
    720720                'exportError'     => __( 'An error occurred while attempting to export personal data.' ),
  • trunk/src/wp-includes/user.php

    r43154 r43175  
    30393039            break;
    30403040        case 'remove_personal_data':
    3041             $description = __( 'Remove Personal Data' );
     3041            $description = __( 'Erase Personal Data' );
    30423042            break;
    30433043        default:
Note: See TracChangeset for help on using the changeset viewer.