Changeset 38076

Timestamp:

07/17/2016 04:04:50 PM (8 years ago)

Author:

SergeyBiryukov

Message:

I18N: Combine two duplicate "Invalid post type" strings.

Props @ramiy.
See #18218.

Location:

trunk/src

Files:

• wp-admin/edit.php (modified) (2 diffs)
• wp-admin/post-new.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (6 diffs)
• wp-includes/post.php (modified) (1 diff)

trunk/src/wp-admin/edit.php

@@ -11 +11 @@
 
 if ( ! $typenow )
-    wp_die( __( 'Invalid post type' ) );
+    wp_die( __( 'Invalid post type.' ) );
 
 if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
@@ -33 +33 @@
 
 if ( ! $post_type_object )
-    wp_die( __( 'Invalid post type' ) );
+    wp_die( __( 'Invalid post type.' ) );
 
 if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {

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

@@ -22 +22 @@
     $post_type = $_GET['post_type'];
 } else {
-    wp_die( __('Invalid post type') );
+    wp_die( __( 'Invalid post type.' ) );
 }
 $post_type_object = get_post_type_object( $post_type );

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

@@ -1303 +1303 @@
         $post_type = get_post_type_object( $post_data['post_type'] );
         if ( ! $post_type )
-            return new IXR_Error( 403, __( 'Invalid post type' ) );
+            return new IXR_Error( 403, __( 'Invalid post type.' ) );
 
         $update = ! empty( $post_data['ID'] );
@@ -4099 +4099 @@
 
         if ( ! post_type_exists( $post_type_name ) )
-            return new IXR_Error( 403, __( 'Invalid post type' ) );
+            return new IXR_Error( 403, __( 'Invalid post type.' ) );
 
         $post_type = get_post_type_object( $post_type_name );
@@ -4858 +4858 @@
             } else {
                 // No other post_type values are allowed here
-                return new IXR_Error( 401, __( 'Invalid post type' ) );
+                return new IXR_Error( 401, __( 'Invalid post type.' ) );
             }
         } else {
@@ -4916 +4916 @@
                     break;
                 default:
-                    return new IXR_Error( 401, __( 'Invalid post type' ) );
+                    return new IXR_Error( 401, __( 'Invalid post type.' ) );
             }
             $author = get_userdata( $content_struct['wp_author_id'] );
@@ -5194 +5194 @@
         // Use wp.editPost to edit post types other than post and page.
         if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
-            return new IXR_Error( 401, __( 'Invalid post type' ) );
+            return new IXR_Error( 401, __( 'Invalid post type.' ) );
 
         // Thwart attempt to change the post type.
@@ -5258 +5258 @@
                         break;
                     default:
-                        return new IXR_Error( 401, __( 'Invalid post type' ) );
+                        return new IXR_Error( 401, __( 'Invalid post type.' ) );
                 }
                 $post_author = $content_struct['wp_author_id'];

trunk/src/wp-includes/post.php

@@ -1070 +1070 @@
 
     if ( ! post_type_exists( $post_type ) ) {
-        return new WP_Error( 'invalid_post_type', __( 'Invalid post type' ) );
+        return new WP_Error( 'invalid_post_type', __( 'Invalid post type.' ) );
     }