Changeset 5547

Timestamp:

05/25/2007 03:33:47 PM (18 years ago)

Author:

rob1n

Message:

More xmlrpc.php i18n fixes from nbachiyski. fixes #3997

Location:

trunk

Files:

• wp-app.php (modified) (7 diffs)
• xmlrpc.php (modified) (8 diffs)

trunk/wp-app.php

@@ -416 +416 @@
 
         if(!current_user_can($cap))
-            $this->auth_required('Sorry, you do not have the right to edit/publish new posts.');
+            $this->auth_required(__('Sorry, you do not have the right to edit/publish new posts.'));
 
         $blog_ID = (int ) $blog_id;
@@ -434 +434 @@
 
         if (!$postID) {
-            $this->internal_error('Sorry, your entry could not be posted. Something wrong happened.');
+            $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
         }
 
@@ -473 +473 @@
 
         if(!current_user_can('edit_post', $entry['ID']))
-            $this->auth_required('Sorry, you do not have the right to edit this post.');
+            $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
 
         $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true;
@@ -493 +493 @@
 
         if (!$result) {
-            $this->internal_error('For some strange yet very annoying reason, this post could not be edited.');
+            $this->internal_error(__('For some strange yet very annoying reason, this post could not be edited.'));
         }
 
@@ -507 +507 @@
 
         if(!current_user_can('edit_post', $postID)) {
-            $this->auth_required('Sorry, you do not have the right to delete this post.');
+            $this->auth_required(__('Sorry, you do not have the right to delete this post.'));
         }
 
@@ -516 +516 @@
 
             if (!$result) {
-                $this->internal_error('For some strange yet very annoying reason, this post could not be deleted.');
+                $this->internal_error(__('For some strange yet very annoying reason, this post could not be deleted.'));
             }
 
@@ -544 +544 @@
 
         if(!current_user_can('upload_files'))
-            $this->auth_required('You do not have permission to upload files.');
+            $this->auth_required(__('You do not have permission to upload files.'));
 
         $fp = fopen("php://input", "rb");

trunk/xmlrpc.php

@@ -971 +971 @@
                 case "post":
                     if(!current_user_can("edit_others_posts")) {
-                        return(new IXR_Error(401, "You are not allowed to " .
-                            "post as this user"));
+                        return(new IXR_Error(401, __("You are not allowed to post as this user")));
                     }
                     break;
                 case "page":
                     if(!current_user_can("edit_others_pages")) {
-                        return(new IXR_Error(401, "You are not allowed to " .
-                            "create pages as this user"));
+                        return(new IXR_Error(401, __("You are not allowed to create pages as this user")));
                     }
                     break;
@@ -1157 +1155 @@
                 case "post":
                     if(!current_user_can("edit_others_posts")) {
-                        return(new IXR_Error(401, "You are not allowed to " .
-                            "change the post author as this user."));
+                        return(new IXR_Error(401, __("You are not allowed to change the post author as this user.")));
                     }
                     break;
                 case "page":
                     if(!current_user_can("edit_others_pages")) {
-                        return(new IXR_Error(401, "You are not allowed to " .
-                            "change the page author as this user."));
+                        return(new IXR_Error(401, __("You are not allowed to change the page author as this user.")));
                     }
                     break;
@@ -1468 +1464 @@
         $upload = wp_upload_bits($name, $type, $bits, $overwrite);
         if ( ! empty($upload['error']) ) {
-            $errorString = 'Could not write file ' . $name . ' (' . $upload['error'] . ')';
+            $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
             logIO('O', '(MW) ' . $errorString);
             return new IXR_Error(500, $errorString);
@@ -1779 +1775 @@
         } else {
             // TODO: Attempt to extract a post ID from the given URL
-            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
         }
         $post_ID = (int) $post_ID;
@@ -1789 +1785 @@
 
         if ( !$post ) // Post_ID not found
-            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
 
         if ( $post_ID == url_to_postid($pagelinkedfrom) )
@@ -1796 +1792 @@
         // Check if pings are on
         if ( 'closed' == $post->ping_status )
-            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
 
         // Let's check that the remote site didn't already pingback this entry
@@ -1878 +1874 @@
         do_action('pingback_post', $comment_ID);
 
-        return "Pingback from $pagelinkedfrom to $pagelinkedto registered. Keep the web talking! :-)";
+        return sprintf(__('Pingback from %1$s to %2$s registered. Keep the web talking! :-)'), $pagelinkedfrom, $pagelinkedto);
     }
 
@@ -1896 +1892 @@
         if (!$post_ID) {
             // We aren't sure that the resource is available and/or pingback enabled
-            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+            return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
         }