From bb91701a02769bbe25090357d671304a567f2ce0 Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Mon, 24 Oct 2016 17:27:51 +0000
Subject: [PATCH] Twenty Seventeen: Fixes incorrect use of _x()

There is an incorrect use in twentyseventeen_posted_on(). This fixes that.

Props ocean90, dineshc, mbelchev, davidakennedy
Fixes #38383


Built from https://develop.svn.wordpress.org/trunk@38885


git-svn-id: http://core.svn.wordpress.org/trunk@38828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyseventeen/inc/template-tags.php | 9 +++++++--
 wp-includes/version.php                                 | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/inc/template-tags.php b/wp-content/themes/twentyseventeen/inc/template-tags.php
index 9848fd59b3..7a599d1fa0 100644
--- a/wp-content/themes/twentyseventeen/inc/template-tags.php
+++ b/wp-content/themes/twentyseventeen/inc/template-tags.php
@@ -17,7 +17,8 @@ function twentyseventeen_posted_on() {
 
 	// Get the author name; wrap it in a link.
 	$byline = sprintf(
-		_x( 'by %s', 'post author', 'twentyseventeen' ),
+		/* translators: %s: post author */
+		__( 'by %s', 'twentyseventeen' ),
 		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . get_the_author() . '</a></span>'
 	);
 
@@ -45,7 +46,11 @@ function twentyseventeen_time_link() {
 	);
 
 	// Wrap the time string in a link, and preface it with 'Posted on'.
-	return '<span class="screen-reader-text">' . _x( 'Posted on', 'post date', 'twentyseventeen' ) . '</span> <a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>';
+	return sprintf(
+		/* translators: %s: post date */
+		__( '<span class="screen-reader-text">Posted on</span> %s', 'twentyseventeen' ),
+		'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
+	);
 }
 endif;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 53fdb0cce2..9a88a1a388 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38884';
+$wp_version = '4.7-alpha-38885';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.