From f8f8de0ecfbdbafbe4a61f69ee32b46589a51458 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 5 Sep 2015 20:45:13 +0000
Subject: [PATCH] Merge two strings in `Walker_Comment::comment()` and
 `Walker_Comment::html5_comment()`.

Props pavelevap.
Fixes #33744.

git-svn-id: https://develop.svn.wordpress.org/trunk@33919 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/comment-template.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index 5c680d9388..8c4c60e520 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -1934,7 +1934,7 @@ class Walker_Comment extends Walker {
 
 		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 			<?php
-				/* translators: 1: date, 2: time */
+				/* translators: 1: comment date, 2: comment time */
 				printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
 			?>
 		</div>
@@ -1983,7 +1983,10 @@ class Walker_Comment extends Walker {
 					<div class="comment-metadata">
 						<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 							<time datetime="<?php comment_time( 'c' ); ?>">
-								<?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
+								<?php
+									/* translators: 1: comment date, 2: comment time */
+									printf( __( '%1$s at %2$s' ), get_comment_date(), get_comment_time() );
+								?>
 							</time>
 						</a>
 						<?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>