WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / theme-compat / comments.php

diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php
index 1016f4f5a9b4196852b767ed9819f46687a30346..617349a7184e2f6c4527674d615ff5b7acf773da 100644 (file)
--- a/wp-includes/theme-compat/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -7,7 +7,14 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file(
+       /* translators: %s: template name */
+       sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ),
+       '3.0',
+       null,
+       /* translators: %s: template name */
+       sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) )
+);
 
 // Do not delete these lines
        if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
@@ -23,8 +30,18 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
 <!-- You can start editing here. -->
 
 <?php if ( have_comments() ) : ?>
-       <h3 id="comments"><?php printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number() ),
-                                                                       number_format_i18n( get_comments_number() ), '&#8220;' . get_the_title() . '&#8221;' ); ?></h3>
+       <h3 id="comments">
+               <?php
+                       if ( 1 == get_comments_number() ) {
+                               /* translators: %s: post title */
+                               printf( __( 'One response to %s' ),  '&#8220;' . get_the_title() . '&#8221;' );
+                       } else {
+                               /* translators: 1: number of comments, 2: post title */
+                               printf( _n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ),
+                                       number_format_i18n( get_comments_number() ),  '&#8220;' . get_the_title() . '&#8221;' );
+                       }
+               ?>
+       </h3>
 
        <div class="navigation">
                <div class="alignleft"><?php previous_comments_link() ?></div>
@@ -69,7 +86,9 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
 
 <?php if ( is_user_logged_in() ) : ?>
 
-<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_edit_user_link(), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php esc_attr_e('Log out of this account'); ?>"><?php _e('Log out &raquo;'); ?></a></p>
+<p><?php /* translators: %s: user profile link  */
+printf( __( 'Logged in as %s.' ), sprintf( '<a href="%1$s">%2$s</a>', get_edit_user_link(), $user_identity ) ); ?>
+<a href="<?php echo wp_logout_url( get_permalink() ); ?>" title="<?php esc_attr_e( 'Log out of this account' ); ?>"><?php _e( 'Log out &raquo;' ); ?></a></p>
 
 <?php else : ?>
 
@@ -84,8 +103,6 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
 
 <?php endif; ?>
 
-<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>'), allowed_tags()); ?></small></p>-->
-
 <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />