From 8a3ed389bb6039c6ff7404d04f37256d01d831f5 Mon Sep 17 00:00:00 2001 From: rob1n Date: Fri, 25 May 2007 15:33:47 +0000 Subject: [PATCH] More xmlrpc.php i18n fixes from nbachiyski. fixes #3997 git-svn-id: http://svn.automattic.com/wordpress/trunk@5547 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-app.php | 14 +++++++------- xmlrpc.php | 24 ++++++++++-------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/wp-app.php b/wp-app.php index 078667df1..ded359efb 100644 --- a/wp-app.php +++ b/wp-app.php @@ -415,7 +415,7 @@ EOD; $cap = ($publish) ? 'publish_posts' : 'edit_posts'; 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; $post_status = ($publish) ? 'publish' : 'draft'; @@ -433,7 +433,7 @@ EOD; $postID = wp_insert_post($post_data); 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.')); } $output = $this->get_entry($postID); @@ -472,7 +472,7 @@ EOD; $this->escape($GLOBALS['entry']); 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; @@ -492,7 +492,7 @@ EOD; $result = wp_update_post($postdata); 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.')); } log_app('function',"put_post($postID)"); @@ -506,7 +506,7 @@ EOD; $this->set_current_entry($postID); 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.')); } if ($entry['post_type'] == 'attachment') { @@ -515,7 +515,7 @@ EOD; $result = wp_delete_post($postID); 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.')); } log_app('function',"delete_post($postID)"); @@ -543,7 +543,7 @@ EOD; $type = $this->get_accepted_content_type(); 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"); $bits = NULL; diff --git a/xmlrpc.php b/xmlrpc.php index 389a9a8a8..6149cf20f 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -970,14 +970,12 @@ class wp_xmlrpc_server extends IXR_Server { switch($post_type) { 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; default: @@ -1156,14 +1154,12 @@ class wp_xmlrpc_server extends IXR_Server { switch($post_type) { 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; default: @@ -1467,7 +1463,7 @@ class wp_xmlrpc_server extends IXR_Server { $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); } @@ -1778,7 +1774,7 @@ class wp_xmlrpc_server extends IXR_Server { } } 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; @@ -1788,14 +1784,14 @@ class wp_xmlrpc_server extends IXR_Server { $post = get_post($post_ID); 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) ) return new IXR_Error(0, __('The source URL and the target URL cannot both point to the same resource.')); // 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 $result = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_ID' AND comment_author_url = '$pagelinkedfrom'"); @@ -1877,7 +1873,7 @@ class wp_xmlrpc_server extends IXR_Server { $comment_ID = wp_new_comment($commentdata); 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); } @@ -1895,7 +1891,7 @@ class wp_xmlrpc_server extends IXR_Server { $post_ID = url_to_postid($url); 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.')); } $actual_post = wp_get_single_post($post_ID, ARRAY_A);