From 2b0b7ffa89ea48ca01ee4c776bbc618e4a717777 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 3 May 2018 18:28:26 +0000 Subject: [PATCH] Privacy: use `sprintf()` in translations. Props birgire. Merges [43150] to the 4.9 branch. See #43473. Built from https://develop.svn.wordpress.org/branches/4.9@43151 git-svn-id: http://core.svn.wordpress.org/branches/4.9@42980 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 670f2b7025..894bb46e00 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -1600,7 +1600,8 @@ final class WP_Privacy_Policy_Content { '

' . __( 'Who we are' ) . '

' . '

' . __( '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.' ) . '

' . '

' . __( '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.' ) . '

' . - '

' . __( 'Our website address is: $1%s.' ) . '

' . + /* translators: %s Site URL */ + '

' . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '

' . '

' . __( 'What personal data we collect and why we collect it' ) . '

' . '

' . __( '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.' ) . '

' . @@ -1673,14 +1674,12 @@ final class WP_Privacy_Policy_Content { '

' . __( '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.' ) . '

'; // 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 b8599ee05f..5453e45b89 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9.6-alpha-43149'; +$wp_version = '4.9.6-alpha-43151'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.