From 0a2c1d77491edacfdec54f28c2bfde8a4da32976 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 5 Oct 2017 00:41:46 +0000
Subject: [PATCH] Twenty Fifteen: Add missing singular placeholder in
 `comments.php`.

Uses the recommended pattern for better compatibility with languages that use the singular form for other numbers. Also adds translator comments.

Props bplv, xkon.
See #39660.
Built from https://develop.svn.wordpress.org/trunk@41761


git-svn-id: http://core.svn.wordpress.org/trunk@41595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/comments.php | 20 ++++++++++++++++++--
 wp-includes/version.php                      |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/comments.php b/wp-content/themes/twentyfifteen/comments.php
index 12b892f6a8..6b97ec394c 100644
--- a/wp-content/themes/twentyfifteen/comments.php
+++ b/wp-content/themes/twentyfifteen/comments.php
@@ -25,8 +25,24 @@ if ( post_password_required() ) {
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
-				printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'twentyfifteen' ),
-					number_format_i18n( get_comments_number() ), get_the_title() );
+				$comments_number = get_comments_number();
+				if ( '1' === $comments_number ) {
+					/* translators: %s: post title */
+					printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentyfifteen' ), get_the_title() );
+				} else {
+					printf(
+						/* translators: 1: number of comments, 2: post title */
+						_nx(
+							'%1$s thought on &ldquo;%2$s&rdquo;',
+							'%1$s thoughts on &ldquo;%2$s&rdquo;',
+							$comments_number,
+							'comments title',
+							'twentyfifteen'
+						),
+						number_format_i18n( $comments_number ),
+						get_the_title()
+					);
+				}
 			?>
 		</h2>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c9783b2ef7..b162dc9869 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41760';
+$wp_version = '4.9-alpha-41761';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.