Changeset 11506

Timestamp:

06/02/2009 07:21:42 AM (16 years ago)

Author:

azaozz

Message:

Add more translator comments for placeholders, props nbachiyski, fixes #10002

Location:

trunk

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -919 +919 @@
 
     function before() {
-        if ( !empty($this->api) )
-            $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme <strong>%s %s</strong>.'), $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 <strong>%1$s %2$s</strong>.'), $this->api->name, $this->api->version);
+        }
     }
 
@@ -943 +945 @@
 
         if ( $this->type == 'web' )
-            $install_actions['themes_page'] = '<a href="' . admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer.') . '</a>';
+            $install_actions['themes_page'] = '<a href="' . admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
         else
             $install_actions['themes_page'] = '<a href="' . admin_url('themes.php') . '" title="' . esc_attr__('Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';

trunk/wp-includes/general-template.php

@@ -497 +497 @@
     //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));
     }
 
@@ -1454 +1455 @@
     $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 '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['feedtitle'], get_bloginfo('name') )) . '" href="' . get_feed_link() . "\" />\n";
-    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['comstitle'], get_bloginfo('name') )) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
+    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['feedtitle'], get_bloginfo('name'), $args['separator'] )) . '" href="' . get_feed_link() . "\" />\n";
+    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['comstitle'], get_bloginfo('name'), $args['separator'] )) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
 }
 

trunk/wp-includes/pluggable.php

@@ -965 +965 @@
 
     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";
@@ -972 +974 @@
         $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 );
     }