From 77b0fad64008ee2205850135db4bfbe3c21933e3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 6 Nov 2015 00:06:25 +0000
Subject: [PATCH] Remove `<code>` tags from translatable strings in
 `wp-includes/class-wp-user.php`.

Add translator comments.

Props ramiy.
Fixes #34576.
Built from https://develop.svn.wordpress.org/trunk@35548


git-svn-id: http://core.svn.wordpress.org/trunk@35512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-user.php | 32 ++++++++++++++++++++++++++++----
 wp-includes/version.php       |  2 +-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php
index 024777dabc..46c248ad92 100644
--- a/wp-includes/class-wp-user.php
+++ b/wp-includes/class-wp-user.php
@@ -269,7 +269,13 @@ class WP_User {
 	 */
 	public function __isset( $key ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+			_deprecated_argument( 'WP_User->id', '2.1',
+				sprintf(
+					/* translators: %s: WP_User->ID */
+					__( 'Use %s instead.' ),
+					'<code>WP_User->ID</code>'
+				)
+			);
 			$key = 'ID';
 		}
 
@@ -293,7 +299,13 @@ class WP_User {
 	 */
 	public function __get( $key ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+			_deprecated_argument( 'WP_User->id', '2.1',
+				sprintf(
+					/* translators: %s: WP_User->ID */
+					__( 'Use %s instead.' ),
+					'<code>WP_User->ID</code>'
+				)
+			);
 			return $this->ID;
 		}
 
@@ -326,7 +338,13 @@ class WP_User {
 	 */
 	public function __set( $key, $value ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+			_deprecated_argument( 'WP_User->id', '2.1',
+				sprintf(
+					/* translators: %s: WP_User->ID */
+					__( 'Use %s instead.' ),
+					'<code>WP_User->ID</code>'
+				)
+			);
 			$this->ID = $value;
 			return;
 		}
@@ -344,7 +362,13 @@ class WP_User {
 	 */
 	public function __unset( $key ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+			_deprecated_argument( 'WP_User->id', '2.1',
+				sprintf(
+					/* translators: %s: WP_User->ID */
+					__( 'Use %s instead.' ),
+					'<code>WP_User->ID</code>'
+				)
+			);
 		}
 
 		if ( isset( $this->data->$key ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1b8cd390a8..b7a252a94b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta3-35547';
+$wp_version = '4.4-beta3-35548';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.