<!-- 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() ), '“' . get_the_title() . '”' ); ?></h3>
+ <h3 id="comments">
+ <?php
+ if ( 1 == get_comments_number() ) {
+ /* translators: %s: post title */
+ printf( __( 'One response to %s' ), '“' . get_the_title() . '”' );
+ } 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() ), '“' . get_the_title() . '”' );
+ }
+ ?>
+ </h3>
<div class="navigation">
<div class="alignleft"><?php previous_comments_link() ?></div>
<?php endif; ?>
<?php endif; ?>
-
<?php if ( comments_open() ) : ?>
<div id="respond">
<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
<?php else : ?>
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
<?php if ( is_user_logged_in() ) : ?>
-<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account'); ?>"><?php _e('Log out »'); ?></a></p>
+<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 »'); ?></a></p>
<?php else : ?>
<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 _e('Submit Comment'); ?>" />
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />
<?php comment_id_fields(); ?>
</p>
-<?php do_action('comment_form', $post->ID); ?>
+<?php
+/** This filter is documented in wp-includes/comment-template.php */
+do_action( 'comment_form', $post->ID );
+?>
</form>