Changeset 38509

Timestamp:

09/02/2016 03:56:22 AM (8 years ago)

Author:

jorbin

Message:

Text Changes: Improve Error messages in XML-RPC

Three changes to the error message strings:

• add some missing periods.
• merge similar translation strings.
• remove the "Something wrong happened" suffix.

Fixes #37792.
Props ramiy.

File:

• trunk/src/wp-includes/class-wp-xmlrpc-server.php (modified) (15 diffs)

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

@@ -1330 +1330 @@
             case 'private':
                 if ( ! current_user_can( $post_type->cap->publish_posts ) )
-                    return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type' ) );
+                    return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type.' ) );
                 break;
             case 'publish':
             case 'future':
                 if ( ! current_user_can( $post_type->cap->publish_posts ) )
-                    return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type' ) );
+                    return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type.' ) );
                 break;
             default:
@@ -1344 +1344 @@
 
         if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) )
-            return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type' ) );
+            return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type.' ) );
 
         $post_data['post_author'] = absint( $post_data['post_author'] );
@@ -1529 +1529 @@
 
         if ( ! $post_ID )
-            return new IXR_Error( 401, __( 'Sorry, your entry could not be posted. Something wrong happened.' ) );
+            return new IXR_Error( 401, __( 'Sorry, your entry could not be posted.' ) );
 
         return strval( $post_ID );
@@ -1795 +1795 @@
             $post_type = get_post_type_object( $filter['post_type'] );
             if ( ! ( (bool) $post_type ) )
-                return new IXR_Error( 403, __( 'The post type specified is not valid' ) );
+                return new IXR_Error( 403, __( 'Invalid post type.' ) );
         } else {
             $post_type = get_post_type_object( 'post' );
@@ -1923 +1923 @@
 
         if ( ! $term )
-            return new IXR_Error( 500, __( 'Sorry, your term could not be created. Something wrong happened.' ) );
+            return new IXR_Error( 500, __( 'Sorry, your term could not be created.' ) );
 
         return strval( $term['term_id'] );
@@ -2495 +2495 @@
         if ( isset( $filter['role'] ) ) {
             if ( get_role( $filter['role'] ) === null )
-                return new IXR_Error( 403, __( 'The role specified is not valid' ) );
+                return new IXR_Error( 403, __( 'Invalid role.' ) );
 
             $query['role'] = $filter['role'];
@@ -3473 +3473 @@
 
         if ( !$result )
-            return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.'));
+            return new IXR_Error(500, __('Sorry, the comment could not be edited.'));
 
         /**
@@ -3527 +3527 @@
             $logged_in = false;
             if ( $allow_anon && get_option('comment_registration') ) {
-                return new IXR_Error( 403, __( 'You must be registered to comment' ) );
+                return new IXR_Error( 403, __( 'You must be registered to comment.' ) );
             } elseif ( ! $allow_anon ) {
                 return $this->error;
@@ -3581 +3581 @@
             if ( get_option('require_name_email') ) {
                 if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] )
-                    return new IXR_Error( 403, __( 'Comment author name and email are required' ) );
+                    return new IXR_Error( 403, __( 'Comment author name and email are required.' ) );
                 elseif ( !is_email($comment['comment_author_email']) )
-                    return new IXR_Error( 403, __( 'A valid email address is required' ) );
+                    return new IXR_Error( 403, __( 'A valid email address is required.' ) );
             }
         }
@@ -4627 +4627 @@
 
         if ( !$post_ID )
-            return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+            return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
 
         $this->attach_uploads( $post_ID, $post_content );
@@ -4881 +4881 @@
             $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
             if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
-                return new IXR_Error( 404, __( 'Invalid post format' ) );
+                return new IXR_Error( 404, __( 'Invalid post format.' ) );
             }
         }
@@ -5086 +5086 @@
 
         if ( !$post_ID )
-            return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+            return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
 
         /**
@@ -5202 +5202 @@
             $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
             if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
-                return new IXR_Error( 404, __( 'Invalid post format' ) );
+                return new IXR_Error( 404, __( 'Invalid post format.' ) );
             }
         }
@@ -5404 +5404 @@
 
         if ( !$result )
-            return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
+            return new IXR_Error(500, __('Sorry, your entry could not be edited.'));
 
         // Only posts can be sticky
@@ -5813 +5813 @@
         $upload = wp_upload_bits($name, null, $bits);
         if ( ! empty($upload['error']) ) {
-            $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
+            $errorString = sprintf(__('Could not write file %1$s (%2$s).'), $name, $upload['error']);
             return new IXR_Error(500, $errorString);
         }