WordPress.org

Make WordPress Core

Ticket #44621: 44621.3.diff

File 44621.3.diff, 10.0 KB (added by sabernhardt, 7 months ago)
  • src/wp-admin/css/edit.css

     
    719719        padding: 0;
    720720}
    721721
    722 .suggested-policy-content {
    723         font-style: italic;
    724 }
    725 
    726722.privacy-text-section a.return-to-top {
    727723        float: right;
    728724        margin-right: -250px;
     
    733729        visibility: hidden;
    734730}
    735731
    736 .wp-suggested-text p {
    737         font-style: italic;
     732.privacy-policy-suggested-text {
     733        background: #fff;
     734        border: 1px solid #ccd0d4;
     735        box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
     736        margin-top: 1em;
     737        padding: 0 1em;
    738738}
    739739
    740 .wp-suggested-text p.privacy-policy-tutorial {
    741         font-style: normal;
     740.privacy-policy-suggested-text strong.privacy-policy-tutorial {
     741        display: block;
     742        margin: 0 0 0.75em;
    742743}
    743744
    744745.notice.wp-pp-notice {
  • src/wp-admin/includes/class-wp-privacy-policy-content.php

     
    491491                        $strings[] = '<p class="privacy-policy-tutorial">' . __( '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>';
    492492                }
    493493
     494                if ( $description ) {
     495                        $strings[] = '<div class="privacy-policy-suggested-text">';
     496                }
    494497                /* translators: Default privacy policy text. %s: Site URL. */
    495498                $strings[] = '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>';
     499                if ( $description ) {
     500                        $strings[] = '</div>';
     501                }
    496502
    497503                /* translators: Default privacy policy heading. */
    498504                $strings[] = '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
     
    518524                        $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
    519525                }
    520526
     527                if ( $description ) {
     528                        $strings[] = '<div class="privacy-policy-suggested-text">';
     529                }
    521530                /* translators: Default privacy policy text. */
    522531                $strings[] = '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor&#8217;s IP address and browser user agent string to help spam detection.' ) . '</p>';
    523532                /* translators: Default privacy policy text. */
    524533                $strings[] = '<p>' . __( '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.' ) . '</p>';
     534                if ( $description ) {
     535                        $strings[] = '</div>';
     536                }
    525537
    526538                /* translators: Default privacy policy heading. */
    527539                $strings[] = '<h3>' . __( 'Media' ) . '</h3>';
     
    531543                        $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    532544                }
    533545
     546                if ( $description ) {
     547                        $strings[] = '<div class="privacy-policy-suggested-text">';
     548                }
    534549                /* translators: Default privacy policy text. */
    535550                $strings[] = '<p>' . $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.' ) . '</p>';
     551                if ( $description ) {
     552                        $strings[] = '</div>';
     553                }
    536554
    537555                /* translators: Default privacy policy heading. */
    538556                $strings[] = '<h3>' . __( 'Contact forms' ) . '</h3>';
     
    550568                        $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    551569                }
    552570
     571                if ( $description ) {
     572                        $strings[] = '<div class="privacy-policy-suggested-text">';
     573                }
    553574                /* translators: Default privacy policy text. */
    554575                $strings[] = '<p>' . $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.' ) . '</p>';
    555576                /* translators: Default privacy policy text. */
     
    558579                $strings[] = '<p>' . __( '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 &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>';
    559580                /* translators: Default privacy policy text. */
    560581                $strings[] = '<p>' . __( '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.' ) . '</p>';
     582                if ( $description ) {
     583                        $strings[] = '</div>';
     584                }
    561585
    562586                /* translators: Default privacy policy heading. */
    563587                $strings[] = '<h3>' . __( 'Embedded content from other websites' ) . '</h3>';
     588                if ( $description ) {
     589                        $strings[] = '<div class="privacy-policy-suggested-text">';
     590                }
    564591                /* translators: Default privacy policy text. */
    565592                $strings[] = '<p>' . $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.' ) . '</p>';
    566593                /* translators: Default privacy policy text. */
    567594                $strings[] = '<p>' . __( '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.' ) . '</p>';
     595                if ( $description ) {
     596                        $strings[] = '</div>';
     597                }
    568598
    569599                /* translators: Default privacy policy heading. */
    570600                $strings[] = '<h3>' . __( 'Analytics' ) . '</h3>';
     
    594624                        $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    595625                }
    596626
     627                if ( $description ) {
     628                        $strings[] = '<div class="privacy-policy-suggested-text">';
     629                }
    597630                /* translators: Default privacy policy text. */
    598631                $strings[] = '<p>' . $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.' ) . '</p>';
    599632                /* translators: Default privacy policy text. */
    600633                $strings[] = '<p>' . __( '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.' ) . '</p>';
     634                if ( $description ) {
     635                        $strings[] = '</div>';
     636                }
    601637
    602638                /* translators: Default privacy policy heading. */
    603639                $strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
     
    607643                        $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
    608644                }
    609645
     646                if ( $description ) {
     647                        $strings[] = '<div class="privacy-policy-suggested-text">';
     648                }
    610649                /* translators: Default privacy policy text. */
    611650                $strings[] = '<p>' . $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.' ) . '</p>';
     651                if ( $description ) {
     652                        $strings[] = '</div>';
     653                }
    612654
    613655                /* translators: Default privacy policy heading. */
    614656                $strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>';
     
    620662                        $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    621663                }
    622664
     665                if ( $description ) {
     666                        $strings[] = '<div class="privacy-policy-suggested-text">';
     667                }
    623668                /* translators: Default privacy policy text. */
    624669                $strings[] = '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>';
     670                if ( $description ) {
     671                        $strings[] = '</div>';
     672                }
    625673
    626674                /* translators: Default privacy policy heading. */
    627675                $strings[] = '<h2>' . __( 'Your contact information' ) . '</h2>';