Index: /trunk/src/js/_enqueues/admin/privacy-tools.js =================================================================== --- /trunk/src/js/_enqueues/admin/privacy-tools.js (revision 50160) +++ /trunk/src/js/_enqueues/admin/privacy-tools.js (revision 50161) @@ -276,5 +276,4 @@ $( document ).on( 'click', function( event ) { var $parent, - $container, range, $target = $( event.target ), @@ -284,12 +283,7 @@ if ( $target.is( 'button.privacy-text-copy' ) ) { - $parent = $target.parent().parent(); - $container = $parent.find( 'div.wp-suggested-text' ); - - if ( ! $container.length ) { - $container = $parent.find( 'div.policy-text' ); - } - - if ( $container.length ) { + $parent = $target.closest( '.privacy-settings-accordion-panel' ); + + if ( $parent.length ) { try { var documentPosition = document.documentElement.scrollTop, @@ -301,13 +295,13 @@ // Hide tutorial content to remove from copied content. range = document.createRange(); - $container.addClass( 'hide-privacy-policy-tutorial' ); + $parent.addClass( 'hide-privacy-policy-tutorial' ); // Copy action. - range.selectNodeContents( $container[0] ); + range.selectNodeContents( $parent[0] ); window.getSelection().addRange( range ); document.execCommand( 'copy' ); // Reset section. - $container.removeClass( 'hide-privacy-policy-tutorial' ); + $parent.removeClass( 'hide-privacy-policy-tutorial' ); window.getSelection().removeAllRanges(); @@ -321,5 +315,5 @@ // Display and speak notice to indicate action complete. copiedNotice.addClass( 'visible' ); - wp.a11y.speak( __( 'The section has been copied to your clipboard.' ) ); + wp.a11y.speak( __( 'The suggested policy text has been copied to your clipboard.' ) ); // Delay notice dismissal. @@ -331,3 +325,22 @@ } }); + + // Label handling to focus the create page button on Privacy settings page. + $( 'body.options-privacy-php label[for=create-page]' ).on( 'click', function( e ) { + e.preventDefault(); + $( 'input#create-page' ).focus(); + } ); + + // Accordion handling in various new Privacy settings pages. + $( '.privacy-settings-accordion' ).on( 'click', '.privacy-settings-accordion-trigger', function() { + var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) ); + + if ( isExpanded ) { + $( this ).attr( 'aria-expanded', 'false' ); + $( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', true ); + } else { + $( this ).attr( 'aria-expanded', 'true' ); + $( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', false ); + } + } ); }); Index: /trunk/src/wp-admin/css/edit.css =================================================================== --- /trunk/src/wp-admin/css/edit.css (revision 50160) +++ /trunk/src/wp-admin/css/edit.css (revision 50161) @@ -696,155 +696,280 @@ } +/** +* Privacy Settings section +*/ + +/* General */ +.privacy-settings #wpcontent, +.privacy-settings.auto-fold #wpcontent { + padding-left: 0; +} + +.privacy-settings-header h1 { + display: inline-block; + font-weight: 600; + margin: 0 0.8rem 1rem; + font-size: 23px; + padding: 9px 0 4px 0; + line-height: 1.3; +} + +/* Header */ +.privacy-settings-header { + text-align: center; + margin: 0 0 1rem; + background: #fff; + border-bottom: 1px solid #e2e4e7; +} + +.privacy-settings-title-section { + display: flex; + align-items: center; + justify-content: center; + clear: both; +} + +.privacy-settings-tabs-wrapper { + /* IE 11 */ + display: -ms-inline-grid; + -ms-grid-columns: 1fr 1fr; + vertical-align: top; + /* modern browsers */ + display: inline-grid; + grid-template-columns: 1fr 1fr; +} + +.privacy-settings-tab { + display: block; /* IE 11 */ + text-decoration: none; + color: inherit; + padding: 0.5rem 1rem 1rem; + margin: 0 1rem; + transition: box-shadow 0.5s ease-in-out; +} + +.privacy-settings-tab:nth-child(1) { + -ms-grid-column: 1; /* IE 11 */ +} + +.privacy-settings-tab:nth-child(2) { + -ms-grid-column: 2; /* IE 11 */ +} + +.privacy-settings-tab:focus { + color: #191e23; + outline: 1px solid #6c7781; + box-shadow: none; +} + +.privacy-settings-tab.active { + box-shadow: inset 0 -3px #007cba; + font-weight: 600; +} + +/* Body */ +.privacy-settings-body { + max-width: 800px; + margin: 0 auto; +} + +.tools-privacy-policy-page th { + min-width: 230px; +} + +.hr-separator { + margin-top: 20px; + margin-bottom: 15px; +} + +/* Accordions */ +.privacy-settings-accordion { + border: 1px solid #ccd0d4; +} + +.privacy-settings-accordion-heading { + margin: 0; + border-top: 1px solid #ccd0d4; + font-size: inherit; + line-height: inherit; + font-weight: 600; + color: inherit; +} + +.privacy-settings-accordion-heading:first-child { + border-top: none; +} + +.privacy-settings-accordion-trigger { + background: #fff; + border: 0; + color: #32373c; + cursor: pointer; + display: flex; + font-weight: 400; + margin: 0; + padding: 1em 3.5em 1em 1.5em; + min-height: 46px; + position: relative; + text-align: left; + width: 100%; + align-items: center; + justify-content: space-between; +} + +.privacy-settings-accordion-trigger:hover, +.privacy-settings-accordion-trigger:active { + background: #f8f9f9; +} + +.privacy-settings-accordion-trigger:focus { + color: #191e23; + border: none; + box-shadow: none; + outline-offset: -1px; + outline: 2px solid #0071a1; + background-color: #f8f9f9; +} + +.privacy-settings-accordion-trigger .title { + pointer-events: none; + font-weight: 600; + flex-grow: 1; +} + +.privacy-settings-accordion-trigger .icon, +.privacy-settings-view-read .icon { + border: solid #555d66; + border-width: 0 2px 2px 0; + height: 0.5rem; + pointer-events: none; + position: absolute; + right: 1.5em; + top: 50%; + transform: translateY(-70%) rotate(45deg); + width: 0.5rem; +} + +.privacy-settings-accordion-trigger .badge { + padding: 0.1rem 0.5rem 0.15rem; + color: #32373c; + font-weight: 600; + margin-left: 0.5rem; +} + +.privacy-settings-accordion-trigger .badge.blue { + border: 1px solid #bfe7f3; +} + +.privacy-settings-accordion-trigger .badge.orange { + border: 1px solid #ffb900; +} + +.privacy-settings-accordion-trigger .badge.red { + border: 1px solid #dc3232; +} + +.privacy-settings-accordion-trigger .badge.green { + border: 1px solid #46b450; +} + +.privacy-settings-accordion-trigger .badge.purple { + border: 1px solid #826eb4; +} + +.privacy-settings-accordion-trigger .badge.gray { + border: 1px solid #ccd0d4; +} + +.privacy-settings-accordion-trigger[aria-expanded="true"] .icon, +.privacy-settings-view-passed[aria-expanded="true"] .icon { + transform: translateY(-30%) rotate(-135deg) +} + +.privacy-settings-accordion-panel { + margin: 0; + padding: 1em 1.5em; + background: #fff; +} + +.privacy-settings-accordion-panel[hidden] { + display: none; +} + +.privacy-settings-accordion-panel a .dashicons { + text-decoration: none; +} + +.privacy-settings-accordion-actions { + text-align: right; + display: block; +} + +.privacy-settings-accordion-actions .success { + display: none; + color: #40860a; + padding-right: 1em; + padding-top: 6px; +} + +.privacy-settings-accordion-actions .success.visible { + display: inline-block; +} + /* Suggested text for privacy policy */ -.wp-privacy-policy-guide { - max-width: 1000px; -} - -.privacy-text-box { - width: calc(100% - 260px); -} - -.privacy-text-box-toc { - float: right; - width: 250px; - background-color: #fff; -} - -.privacy-text-box-toc p { - margin: 0; - padding: 0.7em 1em; - border-bottom: 1px solid #f0f0f1; -} - -.privacy-text-box-toc ol { - margin-left: 2em; -} - -.wp-privacy-policy-guide h3 { - font-size: 1.2em; - margin: 1em 0 0.5em; -} - -.privacy-text-section .privacy-text-copy { - float: right; -} - -.privacy-text-section { - position: relative; - border-top: 1px solid #dcdcde; -} - -.privacy-text-box-head, -.privacy-text-section.text-removed { - padding-bottom: 12px; -} - -.text-removed .policy-text { - color: #646970; - font-weight: 300; - padding-left: 1em; - border-left: 3px solid #dba617; -} - -.text-removed .policy-text h1, -.text-removed .policy-text h2, -.text-removed .policy-text h3, -.text-removed .policy-text h4, -.text-removed .policy-text h5, -.text-removed .policy-text h6 { - color: #3c434a; - font-weight: 500; -} - -.privacy-text-actions { - display: inline-block; - width: 100%; - height: 32px; - line-height: 2.46153846; - padding-bottom: 6px; -} - -.privacy-text-actions .success { +.privacy-settings-accordion-panel.hide-privacy-policy-tutorial .wp-policy-help, /* For back-compat, see #49282 */ +.privacy-settings-accordion-panel.hide-privacy-policy-tutorial .privacy-policy-tutorial, +.privacy-settings-accordion-panel.hide-privacy-policy-tutorial .privacy-text-copy { display: none; - color: #008a20; - float: right; - padding-right: 1em; -} - -.privacy-text-actions .success.visible { - display: inline-block; - height: 32px; -} - -.wp-privacy-policy-guide .policy-text h2 { - margin: 1.2em 0 1em; - padding: 0; -} - -.suggested-policy-content { - font-style: italic; -} - -.privacy-text-section .return-to-top { - float: right; - margin-right: -250px; - margin-top: 6px; -} - -#wpbody:target:before { - content: ""; +} + +.privacy-settings-accordion-panel strong.wp-policy-help, /* For back-compat, see #49282 */ +.privacy-settings-accordion-panel strong.privacy-policy-tutorial { display: block; - padding-top: 50px; - margin-top: -50px; -} - -.hide-privacy-policy-tutorial { - background-color: #fff; -} - -.hide-privacy-policy-tutorial .wp-policy-help, /* For back-compat, see #49282 */ -.hide-privacy-policy-tutorial .privacy-policy-tutorial { - display: none; -} - -.policy-text { - margin-bottom: 1em; -} - -.policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help), -.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) { - background-color: #fff; + margin: 0 0 1em; +} + +.privacy-settings-accordion-panel .wp-suggested-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success), +.privacy-settings-accordion-panel .wp-suggested-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success), +.privacy-settings-accordion-panel > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success), +.privacy-settings-accordion-panel div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help):not(.privacy-text-copy):not(span.success) { margin: 0; padding: 1em; -} - -.policy-text > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help), -.policy-text div > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) + *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) { - padding-top: 0; -} - -.hide-privacy-policy-tutorial > *:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(div):not(.privacy-policy-tutorial):not(.wp-policy-help) { - margin: 1em 0; - padding: 0; -} - -.policy-text ul li, -.policy-text ol li { - margin-left: 2em; -} - -.policy-text ul { - list-style: disc; -} - -strong.wp-policy-help, /* For back-compat, see #49282 */ -strong.privacy-policy-tutorial { - display: block; - margin: 0 0 1em; -} - -.notice.wp-pp-notice { - margin: 15px 0 3px; -} + border-left: 2px solid gray; +} + +/* Media queries */ +@media screen and (max-width: 782px) { + + .privacy-settings-body { + margin: 0 12px; + width: auto; + } + + .privacy-settings .notice { + margin: 5px 10px 15px; + } + + .privacy-settings .update-nag { + margin-right: 10px; + margin-left: 10px; + } + + input#create-page { + margin-top: 10px; + } +} + +@media only screen and (max-width: 1004px) { + + .privacy-settings-body { + margin: 0 22px; + width: auto; + } +} + +/** +* End Privacy Settings section +*/ /*------------------------------------------------------------------------------ Index: /trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php =================================================================== --- /trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php (revision 50160) +++ /trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php (revision 50161) @@ -143,5 +143,5 @@ /* translators: %s: Privacy Policy Guide URL. */ __( 'The suggested privacy policy text has changed. Please review the guide and update your privacy policy.' ), - esc_url( admin_url( 'privacy-policy-guide.php' ) ) + esc_url( admin_url( 'privacy-policy-guide.php?tab=policyguide' ) ) ); ?> @@ -329,5 +329,5 @@ $message = __( 'Need help putting together your new Privacy Policy page? Check out our guide for recommendations on what content to include, along with policies suggested by your plugins and theme.' ); - $url = esc_url( admin_url( 'privacy-policy-guide.php' ) ); + $url = esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ); $label = __( 'View Privacy Policy Guide.' ); @@ -376,5 +376,4 @@ $content_array = self::get_suggested_policy_text(); $content = ''; - $toc = array( '
' . sprintf( $removed, $date ) . '
' . __( '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.' ) . '
'; - } - - /* translators: Default privacy policy text. %s: Site URL. */ - $strings[] = '' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '
'; - - /* translators: Default privacy policy heading. */ - $strings[] = '' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '
'; + } + + if ( $description ) { + /* translators: Default privacy policy heading. */ + $strings[] = '' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '
'; @@ -510,31 +485,30 @@ /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '
'; - /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '
'; - - /* translators: Default privacy policy heading. */ - $strings[] = '' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '
'; + /* translators: Default privacy policy text. */ + $strings[] = '' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '
'; + } + + /* translators: Default privacy policy heading. */ + $strings[] = '' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '
'; - - /* translators: Default privacy policy heading. */ - $strings[] = '' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '
'; + } + + if ( $description ) { + /* translators: Default privacy policy heading. */ + $strings[] = '' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '
'; @@ -542,31 +516,32 @@ /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '
'; - /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'If you visit our login page, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '
'; - /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '
'; - /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '
'; - - /* translators: Default privacy policy heading. */ - $strings[] = '' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '
'; - /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '
'; - - /* translators: Default privacy policy heading. */ - $strings[] = '' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '
'; + /* translators: Default privacy policy text. */ + $strings[] = '' . __( 'If you visit our login page, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '
'; + /* translators: Default privacy policy text. */ + $strings[] = '' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '
'; + /* translators: Default privacy policy text. */ + $strings[] = '' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '
'; + } + + if ( ! $description ) { + /* translators: Default privacy policy heading. */ + $strings[] = '' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '
'; + /* translators: Default privacy policy text. */ + $strings[] = '' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '
'; + } + + if ( $description ) { + /* translators: Default privacy policy heading. */ + $strings[] = '' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider’s privacy policy, if any.' ) . '
'; @@ -583,8 +558,8 @@ /* translators: Privacy policy tutorial. */ $strings[] = '' . __( 'By default WordPress does not share any personal data with anyone.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'If you request a password reset, your IP address will be included in the reset email.' ) . '
'; + } else { + /* translators: Default privacy policy text. */ + $strings[] = '' . $suggested_text . __( 'If you request a password reset, your IP address will be included in the reset email.' ) . '
'; + } /* translators: Default privacy policy heading. */ @@ -594,10 +569,10 @@ /* translators: Privacy policy tutorial. */ $strings[] = '' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '
'; - /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '
'; + } else { + /* translators: Default privacy policy text. */ + $strings[] = '' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '
'; + /* translators: Default privacy policy text. */ + $strings[] = '' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '
'; + } /* translators: Default privacy policy heading. */ @@ -607,8 +582,8 @@ /* translators: Privacy policy tutorial. */ $strings[] = '' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '
'; + } else { + /* translators: Default privacy policy text. */ + $strings[] = '' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '
'; + } /* translators: Default privacy policy heading. */ @@ -620,61 +595,54 @@ /* translators: Privacy policy tutorial. */ $strings[] = '' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '
'; - } - - /* translators: Default privacy policy text. */ - $strings[] = '' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '
'; - - /* translators: Default privacy policy heading. */ - $strings[] = '' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '
'; + } + + if ( $description ) { + /* translators: Default privacy policy heading. */ + $strings[] = '' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '
'; } - /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '
'; } - /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'In this section you should explain what measures you have taken to protect your users’ data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '
'; } - /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '
'; } - /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '
'; } - /* translators: Default privacy policy heading. */ - $strings[] = '' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '
'; } - /* translators: Default privacy policy heading. */ - $strings[] = '' . __( '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.' ) . '
'; @@ -690,8 +658,4 @@ if ( 0 === strpos( $string, '