From 7182b0dbb4598b84e5be4761ca0c1b69f69955ce Mon Sep 17 00:00:00 2001 From: azaozz Date: Tue, 2 Jun 2009 07:21:42 +0000 Subject: [PATCH] Add more translator comments for placeholders, props nbachiyski, fixes #10002 git-svn-id: http://svn.automattic.com/wordpress/trunk@11506 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-upgrader.php | 8 +++++--- wp-includes/general-template.php | 15 +++++++++------ wp-includes/pluggable.php | 9 +++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 44caded041..1ffe0bcaee 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -918,8 +918,10 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { } function before() { - if ( !empty($this->api) ) - $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme %s %s.'), $this->api->name, $this->api->version); + if ( !empty($this->api) ) { + /* translators: 1: theme name, 2: version */ + $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme %1$s %2$s.'), $this->api->name, $this->api->version); + } } function after() { @@ -942,7 +944,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { ); if ( $this->type == 'web' ) - $install_actions['themes_page'] = '' . __('Return to Theme Installer.') . ''; + $install_actions['themes_page'] = '' . __('Return to Theme Installer') . ''; else $install_actions['themes_page'] = '' . __('Return to Themes page') . ''; diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 2480aaeb23..b84f8bb287 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -496,7 +496,8 @@ function wp_title($sep = '»', $display = true, $seplocation = '') { //If it's a search if ( is_search() ) { - $title = sprintf(__('Search Results %s %s'), $t_sep, strip_tags($search)); + /* translators: 1: separator, 2: search phrase */ + $title = sprintf(__('Search Results %1$s %2$s'), $t_sep, strip_tags($search)); } if ( is_404() ) { @@ -1453,15 +1454,17 @@ function automatic_feed_links( $add = true ) { function feed_links( $args ) { $defaults = array( /* translators: Separator between blog name and feed type in feed links */ - 'separator' => _x('»', 'feed link'), - 'feedtitle' => __('%s Feed'), - 'comstitle' => __('%s Comments Feed'), + 'separator' => _x('»', 'feed link'), + /* translators: 1: blog title, 2: separator (raquo) */ + 'feedtitle' => __('%1$s %2$s Feed'), + /* translators: %s: blog title, 2: separator (raquo) */ + 'comstitle' => __('%1$s %2$s Comments Feed'), ); $args = wp_parse_args( $args, $defaults ); - echo '\n"; - echo '\n"; + echo '\n"; + echo '\n"; } /** diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 306bd3f4a4..6074b00f32 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -964,27 +964,36 @@ function wp_notify_postauthor($comment_id, $comment_type='') { if ( empty( $comment_type ) ) $comment_type = 'comment'; if ('comment' == $comment_type) { + /* translators: 1: post id, 2: post title */ $notify_message = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; + /* translators: 1: comment author, 2: author IP, 3: author domain */ $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n"; $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; $notify_message .= __('You can see all comments on this post here: ') . "\r\n"; + /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); } elseif ('trackback' == $comment_type) { + /* translators: 1: post id, 2: post title */ $notify_message = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; + /* translators: 1: website name, 2: author IP, 3: author domain */ $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n"; + /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); } elseif ('pingback' == $comment_type) { + /* translators: 1: post id, 2: post title */ $notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; + /* translators: 1: comment author, 2: author IP, 3: author domain */ $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n"; $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n"; + /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); } $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";