From fdfd15aacc3f613f1f54471d8116132afefbb662 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 10 Feb 2015 02:51:28 +0000
Subject: [PATCH] Use `_n()` in `comments_popup_link()` when setting the
 default string to display if there are more than one comment.

see #26553.
Built from https://develop.svn.wordpress.org/trunk@31401


git-svn-id: http://core.svn.wordpress.org/trunk@31382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-template.php | 4 +++-
 wp-includes/version.php          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index dee3c9da26..355288834f 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1290,7 +1290,9 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 	}
 	if ( false === $more ) {
 		/* translators: 1: Opening span tag with a class, 2: post title, 3: closing span tag, 4: number of comments */
-		$more = sprintf( __( '%4$d Comments%1$s on %2$s%3$s' ), $span, $title, $span_close, $number );
+		$more = sprintf( _n( '%4$d Comment%1$s on %2$s%3$s', '%4$d Comments%1$s on %2$s%3$s', $number ),
+			$span, $title, $span_close, number_format_i18n( $number )
+		);
 	}
 	if ( false === $none ) {
 		/* translators: 1: Opening span tag with a class, 2: post title, 3: closing span tag */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6cfedebf9c..a463c52271 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31400';
+$wp_version = '4.2-alpha-31401';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.