Changeset 44908

Timestamp:

03/15/2019 06:06:08 PM (6 years ago)

Author:

desrosj

Message:

Privacy: Improve data export/erasure error messages and translator comments.

These changes address inaccuracies in current messages and makes them more informative.

Props birgire, garrett-eclipse, desrosj.
See #43438.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (12 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -4516 +4516 @@
 
         if ( $exporter_index > count( $exporters ) ) {
-            wp_send_json_error( __( 'Exporter index out of range.' ) );
+            wp_send_json_error( __( 'Exporter index is out of range.' ) );
         }
 
@@ -4529 +4529 @@
         if ( ! is_array( $exporter ) ) {
             wp_send_json_error(
-                /* translators: %s: array index */
+                /* translators: %s: exporter array index */
                 sprintf( __( 'Expected an array describing the exporter at index %s.' ), $exporter_key )
             );
@@ -4535 +4535 @@
         if ( ! array_key_exists( 'exporter_friendly_name', $exporter ) ) {
             wp_send_json_error(
-                /* translators: %s: array index */
+                /* translators: %s: exporter array index */
                 sprintf( __( 'Exporter array at index %s does not include a friendly name.' ), $exporter_key )
             );
         }
+
+        $exporter_friendly_name = $exporter['exporter_friendly_name'];
+
         if ( ! array_key_exists( 'callback', $exporter ) ) {
             wp_send_json_error(
                 /* translators: %s: exporter friendly name */
-                sprintf( __( 'Exporter does not include a callback: %s.' ), esc_html( $exporter['exporter_friendly_name'] ) )
+                sprintf( __( 'Exporter does not include a callback: %s.' ), esc_html( $exporter_friendly_name ) )
             );
         }
@@ -4548 +4551 @@
             wp_send_json_error(
                 /* translators: %s: exporter friendly name */
-                sprintf( __( 'Exporter callback is not a valid callback: %s.' ), esc_html( $exporter['exporter_friendly_name'] ) )
+                sprintf( __( 'Exporter callback is not a valid callback: %s.' ), esc_html( $exporter_friendly_name ) )
             );
         }
 
-        $callback               = $exporter['callback'];
-        $exporter_friendly_name = $exporter['exporter_friendly_name'];
-
+        $callback = $exporter['callback'];
         $response = call_user_func( $callback, $email_address, $page );
+
         if ( is_wp_error( $response ) ) {
             wp_send_json_error( $response );
@@ -4646 +4648 @@
 
     if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-        wp_send_json_error( __( 'Invalid request ID.' ) );
+        wp_send_json_error( __( 'Invalid request type.' ) );
     }
 
@@ -4709 +4711 @@
 
         if ( ! is_array( $eraser ) ) {
-            /* translators: %d: array index */
+            /* translators: %d: eraser array index */
             wp_send_json_error( sprintf( __( 'Expected an array describing the eraser at index %d.' ), $eraser_index ) );
         }
 
+        if ( ! array_key_exists( 'eraser_friendly_name', $eraser ) ) {
+            /* translators: %d: eraser array index */
+            wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a friendly name.' ), $eraser_index ) );
+        }
+
+        $eraser_friendly_name = $eraser['eraser_friendly_name'];
+
         if ( ! array_key_exists( 'callback', $eraser ) ) {
-            /* translators: %d: array index */
-            wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a callback.' ), $eraser_index ) );
+            wp_send_json_error(
+                sprintf(
+                    /* translators: %s: eraser friendly name */
+                    __( 'Eraser does not include a callback: %s.' ),
+                    esc_html( $eraser_friendly_name )
+                )
+            );
         }
 
         if ( ! is_callable( $eraser['callback'] ) ) {
-            /* translators: %d: array index */
-            wp_send_json_error( sprintf( __( 'Eraser callback at index %d is not a valid callback.' ), $eraser_index ) );
-        }
-
-        if ( ! array_key_exists( 'eraser_friendly_name', $eraser ) ) {
-            /* translators: %d: array index */
-            wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a friendly name.' ), $eraser_index ) );
-        }
-
-        $callback             = $eraser['callback'];
-        $eraser_friendly_name = $eraser['eraser_friendly_name'];
-
+            wp_send_json_error(
+                sprintf(
+                    /* translators: %s: eraser friendly name */
+                    __( 'Eraser callback is not valid: %s.' ),
+                    esc_html( $eraser_friendly_name )
+                )
+            );
+        }
+
+        $callback = $eraser['callback'];
         $response = call_user_func( $callback, $email_address, $page );
 
@@ -4740 +4752 @@
             wp_send_json_error(
                 sprintf(
-                    /* translators: 1: eraser friendly name, 2: array index */
+                    /* translators: 1: eraser friendly name, 2: eraser array index */
                     __( 'Did not receive array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
@@ -4751 +4763 @@
             wp_send_json_error(
                 sprintf(
-                    /* translators: 1: eraser friendly name, 2: array index */
+                    /* translators: 1: eraser friendly name, 2: eraser array index */
                     __( 'Expected items_removed key in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
@@ -4762 +4774 @@
             wp_send_json_error(
                 sprintf(
-                    /* translators: 1: eraser friendly name, 2: array index */
+                    /* translators: 1: eraser friendly name, 2: eraser array index */
                     __( 'Expected items_retained key in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
@@ -4773 +4785 @@
             wp_send_json_error(
                 sprintf(
-                    /* translators: 1: eraser friendly name, 2: array index */
+                    /* translators: 1: eraser friendly name, 2: eraser array index */
                     __( 'Expected messages key in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
@@ -4784 +4796 @@
             wp_send_json_error(
                 sprintf(
-                    /* translators: 1: eraser friendly name, 2: array index */
+                    /* translators: 1: eraser friendly name, 2: eraser array index */
                     __( 'Expected messages key to reference an array in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
@@ -4795 +4807 @@
             wp_send_json_error(
                 sprintf(
-                    /* translators: 1: eraser friendly name, 2: array index */
+                    /* translators: 1: eraser friendly name, 2: eraser array index */
                     __( 'Expected done flag in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),