Make WordPress Core

Changeset 43118


Ignore:
Timestamp:
05/02/2018 06:41:10 PM (6 years ago)
Author:
azaozz
Message:

Privacy: fix inconsistencies in new strings.

Props audrasjb.
Fixes #43925.

Location:
trunk/src
Files:
5 edited

Legend:

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

    r43089 r43118  
    20142014
    20152015    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    2016         wp_send_json_error( __( 'Invalid request ID when generating export file' ) );
     2016        wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
    20172017    }
    20182018
     
    20202020
    20212021    if ( ! is_email( $email_address ) ) {
    2022         wp_send_json_error( __( 'Invalid email address when generating export file' ) );
     2022        wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
    20232023    }
    20242024
     
    20382038        $file = fopen( $index_pathname, 'w' );
    20392039        if ( false === $file ) {
    2040             wp_send_json_error( __( 'Unable to protect export folder from browsing' ) );
     2040            wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
    20412041        }
    20422042        fwrite( $file, 'Silence is golden.' );
     
    20522052    $file = fopen( $html_report_pathname, 'w' );
    20532053    if ( false === $file ) {
    2054         wp_send_json_error( __( 'Unable to open export file (HTML report) for writing' ) );
     2054        wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
    20552055    }
    20562056
     
    20952095            'about-1' => array(
    20962096                array(
    2097                     'name'  => __( 'Report generated for' ),
     2097                    'name'  => _x( 'Report generated for', 'email address' ),
    20982098                    'value' => $email_address,
    20992099                ),
    21002100                array(
    2101                     'name'  => __( 'For site' ),
     2101                    'name'  => _x( 'For site', 'website name' ),
    21022102                    'value' => get_bloginfo( 'name' ),
    21032103                ),
    21042104                array(
    2105                     'name'  => __( 'At URL' ),
     2105                    'name'  => _x( 'At URL', 'website URL' ),
    21062106                    'value' => get_bloginfo( 'url' ),
    21072107                ),
    21082108                array(
    2109                     'name'  => __( 'On' ),
     2109                    'name'  => _x( 'On', 'date/time' ),
    21102110                    'value' => current_time( 'mysql' ),
    21112111                ),
     
    22902290
    22912291    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    2292         wp_send_json_error( __( 'Invalid request ID when merging exporter data' ) );
     2292        wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
    22932293    }
    22942294
  • trunk/src/wp-admin/includes/user.php

    r43085 r43118  
    13531353            '<span style="display:none" class="export_personal_data_processing" >' . __( 'Downloading Data...' ) . '</span>' .
    13541354            '<span style="display:none" class="export_personal_data_success"><a href="#" >' . __( 'Download Personal Data Again' ) . '</a></span>' .
    1355             '<span style="display:none" class="export_personal_data_failed">' . __( 'Download Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1355            '<span style="display:none" class="export_personal_data_failed">' . __( 'Download has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    13561356
    13571357        $download_data_markup .= '</div>';
     
    13941394                <span class="export_personal_data_idle"><a class="button" href="#" ><?php _e( 'Email Data' ); ?></a></span>
    13951395                <span style="display:none" class="export_personal_data_processing button updating-message" ><?php _e( 'Sending Email...' ); ?></span>
    1396                 <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email Sent!' ); ?></span>
    1397                 <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1396                <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email sent.' ); ?></span>
     1397                <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email could not be sent.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    13981398                <?php
    13991399
     
    14641464            $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
    14651465                '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
    1466                 '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1466                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    14671467
    14681468            $remove_data_markup .= '</div>';
     
    15061506                <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
    15071507                <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
    1508                 <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1508                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    15091509                <?php
    15101510
  • trunk/src/wp-admin/privacy.php

    r43091 r43118  
    202202                    <input type="hidden" name="action" value="create-privacy-page" />
    203203                    <span>
    204                         <?php _e( 'Or create a new page: ' ); ?>
     204                        <?php _e( 'Or create a new page:' ); ?>
    205205                    </span>
    206206                    <?php
  • trunk/src/wp-includes/user.php

    r43055 r43118  
    29882988
    29892989    if ( ! is_email( $email_address ) ) {
    2990         return new WP_Error( 'invalid_email', __( 'Invalid email address' ) );
     2990        return new WP_Error( 'invalid_email', __( 'Invalid email address.' ) );
    29912991    }
    29922992
    29932993    if ( ! $action_name ) {
    2994         return new WP_Error( 'invalid_action', __( 'Invalid action name' ) );
     2994        return new WP_Error( 'invalid_action', __( 'Invalid action name.' ) );
    29952995    }
    29962996
  • trunk/src/wp-login.php

    r43008 r43118  
    861861    case 'confirmaction' :
    862862        if ( ! isset( $_GET['request_id'] ) ) {
    863             wp_die( __( 'Invalid request' ) );
     863            wp_die( __( 'Invalid request.' ) );
    864864        }
    865865
Note: See TracChangeset for help on using the changeset viewer.