Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Privacy: use sprintf() in translations.

Browse Source 
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
This commit is contained in:
Andrew Ozz 2018-05-03 18:28:26 +00:00
parent b78d21d9f0
commit 2b0b7ffa89
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/includes/misc.php
View File

@ -1600,7 +1600,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>' .
@ -1673,14 +1674,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 );
}

2
wp-includes/version.php
View File

@ -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.