Changeset 43119 for branches/4.9

Timestamp:

05/02/2018 06:50:49 PM (7 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:

• . (modified) (1 prop)
• src/wp-admin/includes/file.php (modified) (6 diffs)
• src/wp-admin/includes/user.php (modified) (4 diffs)
• src/wp-admin/privacy.php (modified) (1 diff)
• src/wp-includes/user.php (modified) (1 diff)
• src/wp-login.php (modified) (1 diff)

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

@@ -1877 +1877 @@
 
     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.' ) );
     }
 
@@ -1883 +1883 @@
 
     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.' ) );
     }
 
@@ -1901 +1901 @@
         $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.' );
@@ -1915 +1915 @@
     $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.' ) );
     }
 
@@ -1958 +1958 @@
             'about-1' => array(
                 array(
-                    'name'  => __( 'Report generated for' ),
+                    'name'  => _x( 'Report generated for', 'email address' ),
                     'value' => $email_address,
                 ),
                 array(
-                    'name'  => __( 'For site' ),
+                    'name'  => _x( 'For site', 'website name' ),
                     'value' => get_bloginfo( 'name' ),
                 ),
                 array(
-                    'name'  => __( 'At URL' ),
+                    'name'  => _x( 'At URL', 'website URL' ),
                     'value' => get_bloginfo( 'url' ),
                 ),
                 array(
-                    'name'  => __( 'On' ),
+                    'name'  => _x( 'On', 'date/time' ),
                     'value' => current_time( 'mysql' ),
                 ),
@@ -2153 +2153 @@
 
     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.' ) );
     }
 

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

@@ -1312 +1312 @@
             '<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 has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
 
         $download_data_markup .= '</div>';
@@ -1353 +1353 @@
                 <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 sent.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
                 <?php
 
@@ -1423 +1423 @@
             $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 has failed.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
 
             $remove_data_markup .= '</div>';
@@ -1465 +1465 @@
                 <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 has failed.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
                 <?php
 

branches/4.9/src/wp-admin/privacy.php

@@ -196 +196 @@
                     <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

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

@@ -2910 +2910 @@
 
     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.' ) );
     }
 

branches/4.9/src/wp-login.php

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