Ticket #43925: 43925.3.diff

src/wp-admin/includes/file.php

@@ -2013 +2013 @@
         $request = wp_get_user_request_data( $request_id );
 
         if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-                wp_send_json_error( __( 'Invalid request ID when generating export file' ) );
+                wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
         }
 
         $email_address = $request->email;
 
         if ( ! is_email( $email_address ) ) {
-                wp_send_json_error( __( 'Invalid email address when generating export file' ) );
+                wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
         }
 
         // Create the exports folder if needed.
@@ -2037 +2037 @@
         if ( ! file_exists( $index_pathname ) ) {
                 $file = fopen( $index_pathname, 'w' );
                 if ( false === $file ) {
-                        wp_send_json_error( __( 'Unable to protect export folder from browsing' ) );
+                        wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
                 }
                 fwrite( $file, 'Silence is golden.' );
                 fclose( $file );
@@ -2051 +2051 @@
         $html_report_pathname = $exports_dir . $html_report_filename;
         $file = fopen( $html_report_pathname, 'w' );
         if ( false === $file ) {
-                wp_send_json_error( __( 'Unable to open export file (HTML report) for writing' ) );
+                wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
         }
 
         $title = sprintf(
@@ -2289 +2289 @@
         $request = wp_get_user_request_data( $request_id );
 
         if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-                wp_send_json_error( __( 'Invalid request ID when merging exporter data' ) );
+                wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
         }
 
         $export_data = array();

src/wp-admin/includes/user.php

@@ -1352 +1352 @@
                 $download_data_markup .= '<span class="export_personal_data_idle"><a href="#" >' . __( 'Download Personal Data' ) . '</a></span>' .
                         '<span style="display:none" class="export_personal_data_processing" >' . __( 'Downloading Data...' ) . '</span>' .
                         '<span style="display:none" class="export_personal_data_success"><a href="#" >' . __( 'Download Personal Data Again' ) . '</a></span>' .
-                        '<span style="display:none" class="export_personal_data_failed">' . __( 'Download Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
+                        '<span style="display:none" class="export_personal_data_failed">' . __( 'Download could not complete.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
 
                 $download_data_markup .= '</div>';
 
@@ -1393 +1393 @@
                                 ?>
                                 <span class="export_personal_data_idle"><a class="button" href="#" ><?php _e( 'Email Data' ); ?></a></span>
                                 <span style="display:none" class="export_personal_data_processing button updating-message" ><?php _e( 'Sending Email...' ); ?></span>
-                                <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email Sent!' ); ?></span>
-                                <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
+                                <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email Sent.' ); ?></span>
+                                <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email could not be send.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
                                 <?php
 
                                 echo '</div>';
@@ -1463 +1463 @@
 
                         $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
                                 '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
-                                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
+                                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove could not complete.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
 
                         $remove_data_markup .= '</div>';
 
@@ -1505 +1505 @@
                                 ?>
                                 <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
                                 <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
-                                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
+                                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data could not complete.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
                                 <?php
 
                                 echo '</div>';

src/wp-admin/privacy.php

@@ -201 +201 @@
                                 <form method="post" action="">
                                         <input type="hidden" name="action" value="create-privacy-page" />
                                         <span>
-                                                <?php _e( 'Or create a new page: ' ); ?>
+                                                <?php _e( 'Or create a new page:' ); ?> 
                                         </span>
                                         <?php
                                         wp_nonce_field( 'create-privacy-page' );

src/wp-includes/user.php

@@ -2987 +2987 @@
         $action_name   = sanitize_key( $action_name );
 
         if ( ! is_email( $email_address ) ) {
-                return new WP_Error( 'invalid_email', __( 'Invalid email address' ) );
+                return new WP_Error( 'invalid_email', __( 'Invalid email address.' ) );
         }
 
         if ( ! $action_name ) {
-                return new WP_Error( 'invalid_action', __( 'Invalid action name' ) );
+                return new WP_Error( 'invalid_action', __( 'Invalid action name.' ) );
         }
 
         $user    = get_user_by( 'email', $email_address );

src/wp-login.php

@@ -860 +860 @@
 
         case 'confirmaction' :
                 if ( ! isset( $_GET['request_id'] ) ) {
-                        wp_die( __( 'Invalid request' ) );
+                        wp_die( __( 'Invalid request.' ) );
                 }
 
                 $request_id = (int) $_GET['request_id'];