From 58b2e6e143cfd062c72cbb0da158f85dd756c7de Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 3 May 2018 18:25:21 +0000
Subject: [PATCH] Privacy: use `sprintf()` in translations.

Props birgire.
See #43473.
Built from https://develop.svn.wordpress.org/trunk@43150


git-svn-id: http://core.svn.wordpress.org/trunk@42979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/misc.php | 7 +++----
 wp-includes/version.php    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index bdd1df2867..df307e4e79 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -1649,7 +1649,8 @@ final class WP_Privacy_Policy_Content {
 			'<h2>' . __( 'Who we are' ) . '</h2>' .
 			'<p class="wp-policy-help">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
 			'<p class="wp-policy-help">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>' .
-			'<p>' . __( 'Our website address is: $1%s.' ) . '</p>' .
+			/* translators: %s Site URL */
+			'<p>' . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
 
 			'<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>' .
 			'<p class="wp-policy-help">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include transactional data, such as purchase information; technical data, such as information about cookies; and personal data, such as user account information.' ) . '</p>' .
@@ -1722,14 +1723,12 @@ final class WP_Privacy_Policy_Content {
 			'<p class="wp-policy-help">' . __( 'If you are a  member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>';
 			// End of the suggested policy text.
 
-		$content = str_replace( '$1%s', get_bloginfo( 'url', 'display' ), $content );
-
 		/**
 		 * Filters the default content suggested for inclusion in a privacy policy.
 		 *
 		 * @since 4.9.6
 		 *
-		 * @param $content string The defauld policy content.
+		 * @param $content string The default policy content.
 		 */
 		return apply_filters( 'wp_get_default_privacy_policy_content', $content );
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f825a89725..23b4e99dce 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43148';
+$wp_version = '5.0-alpha-43150';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.