- Timestamp:
- 05/02/2018 06:41:10 PM (7 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/file.php
r43089 r43118 2014 2014 2015 2015 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.' ) ); 2017 2017 } 2018 2018 … … 2020 2020 2021 2021 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.' ) ); 2023 2023 } 2024 2024 … … 2038 2038 $file = fopen( $index_pathname, 'w' ); 2039 2039 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.' ) ); 2041 2041 } 2042 2042 fwrite( $file, 'Silence is golden.' ); … … 2052 2052 $file = fopen( $html_report_pathname, 'w' ); 2053 2053 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.' ) ); 2055 2055 } 2056 2056 … … 2095 2095 'about-1' => array( 2096 2096 array( 2097 'name' => _ _( 'Report generated for' ),2097 'name' => _x( 'Report generated for', 'email address' ), 2098 2098 'value' => $email_address, 2099 2099 ), 2100 2100 array( 2101 'name' => _ _( 'For site' ),2101 'name' => _x( 'For site', 'website name' ), 2102 2102 'value' => get_bloginfo( 'name' ), 2103 2103 ), 2104 2104 array( 2105 'name' => _ _( 'AtURL' ),2105 'name' => _x( 'At URL', 'website URL' ), 2106 2106 'value' => get_bloginfo( 'url' ), 2107 2107 ), 2108 2108 array( 2109 'name' => _ _( 'On' ),2109 'name' => _x( 'On', 'date/time' ), 2110 2110 'value' => current_time( 'mysql' ), 2111 2111 ), … … 2290 2290 2291 2291 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.' ) ); 2293 2293 } 2294 2294 -
trunk/src/wp-admin/includes/user.php
r43085 r43118 1353 1353 '<span style="display:none" class="export_personal_data_processing" >' . __( 'Downloading Data...' ) . '</span>' . 1354 1354 '<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>'; 1356 1356 1357 1357 $download_data_markup .= '</div>'; … … 1394 1394 <span class="export_personal_data_idle"><a class="button" href="#" ><?php _e( 'Email Data' ); ?></a></span> 1395 1395 <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> 1398 1398 <?php 1399 1399 … … 1464 1464 $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' . 1465 1465 '<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>'; 1467 1467 1468 1468 $remove_data_markup .= '</div>'; … … 1506 1506 <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span> 1507 1507 <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> 1509 1509 <?php 1510 1510 -
trunk/src/wp-admin/privacy.php
r43091 r43118 202 202 <input type="hidden" name="action" value="create-privacy-page" /> 203 203 <span> 204 <?php _e( 'Or create a new page: ' ); ?>204 <?php _e( 'Or create a new page:' ); ?> 205 205 </span> 206 206 <?php -
trunk/src/wp-includes/user.php
r43055 r43118 2988 2988 2989 2989 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.' ) ); 2991 2991 } 2992 2992 2993 2993 if ( ! $action_name ) { 2994 return new WP_Error( 'invalid_action', __( 'Invalid action name ' ) );2994 return new WP_Error( 'invalid_action', __( 'Invalid action name.' ) ); 2995 2995 } 2996 2996 -
trunk/src/wp-login.php
r43008 r43118 861 861 case 'confirmaction' : 862 862 if ( ! isset( $_GET['request_id'] ) ) { 863 wp_die( __( 'Invalid request ' ) );863 wp_die( __( 'Invalid request.' ) ); 864 864 } 865 865
Note: See TracChangeset
for help on using the changeset viewer.