Changeset 20972

Timestamp:

06/01/2012 07:05:30 PM (12 years ago)

Author:

ryan

Message:

Consolodate some strings. Props pavelevap. fixes #20809

Location:

trunk/wp-includes

Files:

• class-wp-xmlrpc-server.php (modified) (14 diffs)
• taxonomy.php (modified) (6 diffs)

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

@@ -1474 +1474 @@
 
         if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
-            return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+            return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
 
         $taxonomy = get_taxonomy( $content_struct['taxonomy'] );
@@ -1562 +1562 @@
 
         if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
-            return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+            return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
 
         $taxonomy = get_taxonomy( $content_struct['taxonomy'] );
@@ -1654 +1654 @@
 
         if ( ! taxonomy_exists( $taxonomy ) )
-            return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+            return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
 
         $taxonomy = get_taxonomy( $taxonomy );
@@ -1721 +1721 @@
 
         if ( ! taxonomy_exists( $taxonomy ) )
-            return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+            return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
 
         $taxonomy = get_taxonomy( $taxonomy );
@@ -1774 +1774 @@
 
         if ( ! taxonomy_exists( $taxonomy ) )
-            return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+            return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
 
         $taxonomy = get_taxonomy( $taxonomy );
@@ -1853 +1853 @@
 
         if ( ! taxonomy_exists( $taxonomy ) )
-            return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+            return new IXR_Error( 403, __( 'Invalid taxonomy' ) );
 
         $taxonomy = get_taxonomy( $taxonomy );
@@ -2951 +2951 @@
 
         if ( !current_user_can( 'upload_files' ) )
-            return new IXR_Error( 403, __( 'You are not allowed to upload files to this site.' ) );
+            return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
 
         do_action('xmlrpc_call', 'wp.getMediaItem');
@@ -2996 +2996 @@
 
         if ( !current_user_can( 'upload_files' ) )
-            return new IXR_Error( 401, __( 'Sorry, you cannot upload files.' ) );
+            return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
 
         do_action('xmlrpc_call', 'wp.getMediaLibrary');
@@ -3105 +3105 @@
 
         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 );
@@ -3680 +3680 @@
             } 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 {
@@ -3736 +3736 @@
                     break;
                 default:
-                    return(new IXR_Error(401, __('Invalid post type.')));
+                    return(new IXR_Error(401, __('Invalid post type')));
                     break;
             }
@@ -3988 +3988 @@
         // 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.
@@ -4040 +4040 @@
                     break;
                 default:
-                    return(new IXR_Error(401, __('Invalid post type.')));
+                    return(new IXR_Error(401, __('Invalid post type')));
                     break;
             }
@@ -4532 +4532 @@
 
         if ( !current_user_can('upload_files') ) {
-            $this->error = new IXR_Error(401, __('You are not allowed to upload files to this site.'));
+            $this->error = new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
             return $this->error;
         }

trunk/wp-includes/taxonomy.php

@@ -503 +503 @@
     foreach ( (array) $taxonomies as $taxonomy ) {
         if ( ! taxonomy_exists( $taxonomy ) )
-            return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) );
+            return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
     }
 
@@ -856 +856 @@
 
     if ( ! taxonomy_exists($taxonomy) ) {
-        $error = new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
+        $error = new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
         return $error;
     }
@@ -985 +985 @@
 function get_term_children( $term_id, $taxonomy ) {
     if ( ! taxonomy_exists($taxonomy) )
-        return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
+        return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
     $term_id = intval( $term_id );
@@ -1175 +1175 @@
     foreach ( $taxonomies as $taxonomy ) {
         if ( ! taxonomy_exists($taxonomy) ) {
-            $error = new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
+            $error = new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
             return $error;
         }
@@ -1876 +1876 @@
     foreach ( (array) $taxonomies as $taxonomy ) {
         if ( ! taxonomy_exists($taxonomy) )
-            return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
+            return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
     }
 
@@ -2147 +2147 @@
 
     if ( ! taxonomy_exists($taxonomy) )
-        return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
+        return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
     if ( !is_array($terms) )