Changeset 39278

Timestamp:

11/17/2016 03:52:18 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Text Changes: Merge some duplicate strings with the same meaning in error messages, adjust some other strings for consistency and accuracy.

Props ramiy, SergeyBiryukov.
Fixes #38808.

Location:

trunk/src

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (3 diffs)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/rest-api.php (modified) (2 diffs)
• wp-includes/rest-api/class-wp-rest-server.php (modified) (1 diff)
• wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (modified) (2 diffs)
• wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php (modified) (3 diffs)
• wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php (modified) (2 diffs)
• wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/includes/post.php

@@ -161 +161 @@
         $valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
         if ( !$valid_date ) {
-            return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+            return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );
         }
         $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -1271 +1271 @@
         } elseif ( isset( $post_data['sticky'] ) )  {
             if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
-                return new IXR_Error( 401, __( 'Sorry, you are not allowed to stick this post.' ) );
+                return new IXR_Error( 401, __( 'Sorry, you are not allowed to make posts sticky.' ) );
             }
 
@@ -1796 +1796 @@
 
         if ( ! current_user_can( $post_type->cap->edit_posts ) )
-            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ));
+            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
 
         $query['post_type'] = $post_type->name;
@@ -4118 +4118 @@
 
         if ( ! current_user_can( $post_type->cap->edit_posts ) )
-            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
+            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
 
         return $this->_prepare_post_type( $post_type, $fields );

trunk/src/wp-includes/post.php

@@ -3124 +3124 @@
     if ( ! $valid_date ) {
         if ( $wp_error ) {
-            return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+            return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );
         } else {
             return 0;
@@ -3404 +3404 @@
         if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
             if ( $wp_error ) {
-                return new WP_Error('invalid_page_template', __('The page template is invalid.'));
+                return new WP_Error( 'invalid_page_template', __( 'Invalid page template.' ) );
             }
             update_post_meta( $post_ID, '_wp_page_template', 'default' );

trunk/src/wp-includes/rest-api.php

@@ -1041 +1041 @@
             case 'date-time' :
                 if ( ! rest_parse_date( $value ) ) {
-                    return new WP_Error( 'rest_invalid_date', __( 'The date you provided is invalid.' ) );
+                    return new WP_Error( 'rest_invalid_date', __( 'Invalid date.' ) );
                 }
                 break;
@@ -1051 +1051 @@
                 // https://core.trac.wordpress.org/ticket/38506
                 if ( ! is_email( $value ) || strlen( $value ) < 6 ) {
-                    return new WP_Error( 'rest_invalid_email', __( 'The email address you provided is invalid.' ) );
+                    return new WP_Error( 'rest_invalid_email', __( 'Invalid email address.' ) );
                 }
                 break;

trunk/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -286 +286 @@
             $jsonp_callback = $_GET['_jsonp'];
             if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) {
-                echo $this->json_error( 'rest_callback_invalid', __( 'The JSONP callback function is invalid.' ), 400 );
+                echo $this->json_error( 'rest_callback_invalid', __( 'Invalid JSONP callback function.' ), 400 );
                 return false;
             }

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -436 +436 @@
          */
         if ( empty( $prepared_comment['comment_content'] ) ) {
-            return new WP_Error( 'rest_comment_content_invalid', __( 'Comment content is invalid.' ), array( 'status' => 400 ) );
+            return new WP_Error( 'rest_comment_content_invalid', __( 'Invalid comment content.' ), array( 'status' => 400 ) );
         }
 
@@ -638 +638 @@
 
             if ( isset( $prepared_args['comment_content'] ) && empty( $prepared_args['comment_content'] ) ) {
-                return new WP_Error( 'rest_comment_content_invalid', __( 'Comment content is invalid.' ), array( 'status' => 400 ) );
+                return new WP_Error( 'rest_comment_content_invalid', __( 'Invalid comment content.' ), array( 'status' => 400 ) );
             }
 

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -127 +127 @@
 
         if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
-            return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit these posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );
+            return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit posts in this post type.' ), array( 'status' => rest_authorization_required_code() ) );
         }
 
@@ -459 +459 @@
 
         if ( ! current_user_can( $post_type->cap->create_posts ) ) {
-            return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to create new posts.' ), array( 'status' => rest_authorization_required_code() ) );
+            return new WP_Error( 'rest_cannot_create', __( 'Sorry, you are not allowed to create posts as this user.' ), array( 'status' => rest_authorization_required_code() ) );
         }
 
@@ -709 +709 @@
 
         if ( $post && ! $this->check_delete_permission( $post ) ) {
-            return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete posts.' ), array( 'status' => rest_authorization_required_code() ) );
+            return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this post.' ), array( 'status' => rest_authorization_required_code() ) );
         }
 

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php

@@ -547 +547 @@
 
         if ( ! current_user_can( 'delete_term', $term->term_id ) ) {
-            return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete resource.' ), array( 'status' => rest_authorization_required_code() ) );
+            return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.' ), array( 'status' => rest_authorization_required_code() ) );
         }
 
@@ -824 +824 @@
                 ),
                 'link'        => array(
-                    'description'  => __( 'URL to the resource.' ),
+                    'description'  => __( 'URL of the resource.' ),
                     'type'         => 'string',
                     'format'       => 'uri',

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -388 +388 @@
 
         if ( ! current_user_can( 'create_users' ) ) {
-            return new WP_Error( 'rest_cannot_create_user', __( 'Sorry, you are not allowed to create resource.' ), array( 'status' => rest_authorization_required_code() ) );
+            return new WP_Error( 'rest_cannot_create_user', __( 'Sorry, you are not allowed to create new resource.' ), array( 'status' => rest_authorization_required_code() ) );
         }
 
@@ -544 +544 @@
 
         if ( email_exists( $request['email'] ) && $request['email'] !== $user->user_email ) {
-            return new WP_Error( 'rest_user_invalid_email', __( 'Email address is invalid.' ), array( 'status' => 400 ) );
+            return new WP_Error( 'rest_user_invalid_email', __( 'Invalid email address.' ), array( 'status' => 400 ) );
         }
 
@@ -552 +552 @@
 
         if ( ! empty( $request['slug'] ) && $request['slug'] !== $user->user_nicename && get_user_by( 'slug', $request['slug'] ) ) {
-            return new WP_Error( 'rest_user_invalid_slug', __( 'Slug is invalid.' ), array( 'status' => 400 ) );
+            return new WP_Error( 'rest_user_invalid_slug', __( 'Invalid slug.' ), array( 'status' => 400 ) );
         }
 
@@ -1140 +1140 @@
                 ),
                 'link'        => array(
-                    'description' => __( 'Author URL to the resource.' ),
+                    'description' => __( 'Author URL of the resource.' ),
                     'type'        => 'string',
                     'format'      => 'uri',

trunk/src/wp-includes/script-loader.php

@@ -232 +232 @@
     // Strings for 'jquery-ui-autocomplete' live region messages
     did_action( 'init' ) && $scripts->localize( 'jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
-        'noResults' => __( 'No search results.' ),
+        'noResults' => __( 'No results found.' ),
         /* translators: Number of results found when using jQuery UI Autocomplete */
         'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ),