From 2c5a3782917781047528ddb44d9c08d42057b65c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 5 Oct 2017 00:42:46 +0000
Subject: [PATCH] Twenty Fourteen: 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@41762


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

diff --git a/wp-content/themes/twentyfourteen/comments.php b/wp-content/themes/twentyfourteen/comments.php
index 781c06d4c7..d62e91a7c7 100644
--- a/wp-content/themes/twentyfourteen/comments.php
+++ b/wp-content/themes/twentyfourteen/comments.php
@@ -24,8 +24,24 @@ if ( post_password_required() ) {
 
 	<h2 class="comments-title">
 		<?php
-			printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyfourteen' ),
-				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', 'twentyfourteen' ), 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',
+						'twentyfourteen'
+					),
+					number_format_i18n( $comments_number ),
+					get_the_title()
+				);
+			}
 		?>
 	</h2>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b162dc9869..3c8564038b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41761';
+$wp_version = '4.9-alpha-41762';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.