WordPress.org

Make WordPress Core

Changeset 43119 for branches/4.9


Ignore:
Timestamp:
05/02/2018 06:50:49 PM (2 years ago)
Author:
azaozz
Message:

Privacy: fix inconsistencies in new strings.

Props audrasjb.
Merges [43118] to the 4.9 branch.
Fixes #43925.

Location:
branches/4.9
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

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

    r43108 r43119  
    18771877
    18781878    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    1879         wp_send_json_error( __( 'Invalid request ID when generating export file' ) );
     1879        wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
    18801880    }
    18811881
     
    18831883
    18841884    if ( ! is_email( $email_address ) ) {
    1885         wp_send_json_error( __( 'Invalid email address when generating export file' ) );
     1885        wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
    18861886    }
    18871887
     
    19011901        $file = fopen( $index_pathname, 'w' );
    19021902        if ( false === $file ) {
    1903             wp_send_json_error( __( 'Unable to protect export folder from browsing' ) );
     1903            wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
    19041904        }
    19051905        fwrite( $file, 'Silence is golden.' );
     
    19151915    $file = fopen( $html_report_pathname, 'w' );
    19161916    if ( false === $file ) {
    1917         wp_send_json_error( __( 'Unable to open export file (HTML report) for writing' ) );
     1917        wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
    19181918    }
    19191919
     
    19581958            'about-1' => array(
    19591959                array(
    1960                     'name'  => __( 'Report generated for' ),
     1960                    'name'  => _x( 'Report generated for', 'email address' ),
    19611961                    'value' => $email_address,
    19621962                ),
    19631963                array(
    1964                     'name'  => __( 'For site' ),
     1964                    'name'  => _x( 'For site', 'website name' ),
    19651965                    'value' => get_bloginfo( 'name' ),
    19661966                ),
    19671967                array(
    1968                     'name'  => __( 'At URL' ),
     1968                    'name'  => _x( 'At URL', 'website URL' ),
    19691969                    'value' => get_bloginfo( 'url' ),
    19701970                ),
    19711971                array(
    1972                     'name'  => __( 'On' ),
     1972                    'name'  => _x( 'On', 'date/time' ),
    19731973                    'value' => current_time( 'mysql' ),
    19741974                ),
     
    21532153
    21542154    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    2155         wp_send_json_error( __( 'Invalid request ID when merging exporter data' ) );
     2155        wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
    21562156    }
    21572157
  • branches/4.9/src/wp-admin/includes/user.php

    r43111 r43119  
    13121312            '<span style="display:none" class="export_personal_data_processing" >' . __( 'Downloading Data...' ) . '</span>' .
    13131313            '<span style="display:none" class="export_personal_data_success"><a href="#" >' . __( 'Download Personal Data Again' ) . '</a></span>' .
    1314             '<span style="display:none" class="export_personal_data_failed">' . __( 'Download Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1314            '<span style="display:none" class="export_personal_data_failed">' . __( 'Download has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    13151315
    13161316        $download_data_markup .= '</div>';
     
    13531353                <span class="export_personal_data_idle"><a class="button" href="#" ><?php _e( 'Email Data' ); ?></a></span>
    13541354                <span style="display:none" class="export_personal_data_processing button updating-message" ><?php _e( 'Sending Email...' ); ?></span>
    1355                 <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email Sent!' ); ?></span>
    1356                 <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1355                <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email sent.' ); ?></span>
     1356                <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>
    13571357                <?php
    13581358
     
    14231423            $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
    14241424                '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
    1425                 '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1425                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    14261426
    14271427            $remove_data_markup .= '</div>';
     
    14651465                <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
    14661466                <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
    1467                 <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1467                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    14681468                <?php
    14691469
  • branches/4.9/src/wp-admin/privacy.php

    r43103 r43119  
    196196                    <input type="hidden" name="action" value="create-privacy-page" />
    197197                    <span>
    198                         <?php _e( 'Or create a new page: ' ); ?>
     198                        <?php _e( 'Or create a new page:' ); ?>
    199199                    </span>
    200200                    <?php
  • branches/4.9/src/wp-includes/user.php

    r43117 r43119  
    29102910
    29112911    if ( ! is_email( $email_address ) ) {
    2912         return new WP_Error( 'invalid_email', __( 'Invalid email address' ) );
     2912        return new WP_Error( 'invalid_email', __( 'Invalid email address.' ) );
    29132913    }
    29142914
    29152915    if ( ! $action_name ) {
    2916         return new WP_Error( 'invalid_action', __( 'Invalid action name' ) );
     2916        return new WP_Error( 'invalid_action', __( 'Invalid action name.' ) );
    29172917    }
    29182918
  • branches/4.9/src/wp-login.php

    r43083 r43119  
    841841case 'confirmaction' :
    842842    if ( ! isset( $_GET['request_id'] ) ) {
    843         wp_die( __( 'Invalid request' ) );
     843        wp_die( __( 'Invalid request.' ) );
    844844    }
    845845
Note: See TracChangeset for help on using the changeset viewer.