WordPress.org

Make WordPress Core

Changeset 43176


Ignore:
Timestamp:
05/07/2018 04:45:42 PM (17 months ago)
Author:
SergeyBiryukov
Message:

Privacy: Use the terms "erase"/"erasure" instead of "remove"/"removal" for personal data.

Props allendav.
Merges [43175] to the 4.9 branch.
Fixes #43920.

Location:
branches/4.9
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

  • branches/4.9/src/wp-admin/includes/user.php

    r43173 r43176  
    837837    ?>
    838838    <div class="wrap nosubsub">
    839         <h1><?php esc_html_e( 'Remove Personal Data' ); ?></h1>
     839        <h1><?php esc_html_e( 'Erase Personal Data' ); ?></h1>
    840840        <hr class="wp-header-end" />
    841841
     
    843843
    844844        <form method="post" class="wp-privacy-request-form">
    845             <h2><?php esc_html_e( 'Add Data Removal Request' ); ?></h2>
     845            <h2><?php esc_html_e( 'Add Data Erasure Request' ); ?></h2>
    846846            <p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
    847847
     
    885885function _wp_privacy_hook_requests_page() {
    886886    add_submenu_page( 'tools.php', __( 'Export Personal Data' ), __( 'Export Personal Data' ), 'export_others_personal_data', 'export_personal_data', '_wp_personal_data_export_page' );
    887     add_submenu_page( 'tools.php', __( 'Remove Personal Data' ), __( 'Remove Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
     887    add_submenu_page( 'tools.php', __( 'Erase Personal Data' ), __( 'Erase Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
    888888}
    889889
     
    976976
    977977        $query = "
    978             SELECT post_status, COUNT( * ) AS num_posts 
    979             FROM {$wpdb->posts} 
     978            SELECT post_status, COUNT( * ) AS num_posts
     979            FROM {$wpdb->posts}
    980980            WHERE post_type = %s
    981981            AND post_name = %s
     
    14221422                '">';
    14231423
    1424             $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
    1425                 '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
    1426                 '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1424            $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Erase Personal Data' ) . '</a></span>' .
     1425                '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Erasing Data...' ) . '</span>' .
     1426                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Erase has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    14271427
    14281428            $remove_data_markup .= '</div>';
     
    14641464
    14651465                ?>
    1466                 <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
    1467                 <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
    1468                 <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1466                <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Erase Personal Data' ); ?></a></span>
     1467                <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Erasing Data...' ); ?></span>
     1468                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Erasing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    14691469                <?php
    14701470
  • branches/4.9/src/wp-includes/script-loader.php

    r43092 r43176  
    663663            'xfn', 'privacyToolsL10n', array(
    664664                'noDataFound'     => __( 'No personal data was found for this user.' ),
    665                 'foundAndRemoved' => __( 'All of the personal data found for this user was removed.' ),
    666                 'noneRemoved'     => __( 'Personal data was found for this user but was not removed.' ),
    667                 'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not removed.' ),
    668                 'removalError'    => __( 'An error occurred while attempting to find and remove personal data.' ),
     665                'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
     666                'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
     667                'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
     668                'removalError'    => __( 'An error occurred while attempting to find and erase personal data.' ),
    669669                'noExportFile'    => __( 'No personal data export file was generated.' ),
    670670                'exportError'     => __( 'An error occurred while attempting to export personal data.' ),
  • branches/4.9/src/wp-includes/user.php

    r43157 r43176  
    29612961            break;
    29622962        case 'remove_personal_data':
    2963             $description = __( 'Remove Personal Data' );
     2963            $description = __( 'Erase Personal Data' );
    29642964            break;
    29652965        default:
Note: See TracChangeset for help on using the changeset viewer.