WordPress.org

Make WordPress Core

Changeset 43912


Ignore:
Timestamp:
11/21/2018 01:47:49 AM (3 years ago)
Author:
pento
Message:

Upgrade/Install: Split Sample Page, Hello World, and Privacy Policy content.

[43820] converted the content to blocks, but included block markers in the translateable strings, which made translations difficult to do accurately.

Props desrosj, dd32, ocean90.
See #45151.

Location:
branches/5.0/src/wp-admin/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/5.0/src/wp-admin/includes/misc.php

    r43820 r43912  
    16911691        }
    16921692
     1693        /* translators: default privacy policy heading. */
    16931694        $strings[] = '<h2>' . __( 'Who we are' ) . '</h2>';
    16941695
    16951696        if ( $description ) {
     1697            /* translators: privacy policy tutorial. */
    16961698            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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>';
     1699            /* translators: privacy policy tutorial. */
    16971700            $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>';
    16981701        }
    16991702
    1700         /* translators: %s Site URL */
     1703        /* translators: default privacy policy text, %s Site URL. */
    17011704        $strings[] = '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>';
    17021705
     1706        /* translators: default privacy policy heading. */
    17031707        $strings[] = '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
    17041708
    17051709        if ( $description ) {
     1710            /* translators: privacy policy tutorial. */
    17061711            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
     1712            /* translators: privacy policy tutorial. */
    17071713            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'You should also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>';
     1714            /* translators: privacy policy tutorial. */
    17081715            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>';
     1716            /* translators: privacy policy tutorial. */
    17091717            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user&#8217;s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>';
     1718            /* translators: privacy policy tutorial. */
    17101719            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</p>';
    17111720        }
    1712        
     1721
     1722        /* translators: default privacy policy heading. */
    17131723        $strings[] = '<h3>' . __( 'Comments' ) . '</h3>';
    17141724
    17151725        if ( $description ) {
     1726            /* translators: privacy policy tutorial. */
    17161727            $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>';
    17171728        }
    17181729
     1730        /* translators: default privacy policy text. */
    17191731        $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>';
     1732        /* translators: default privacy policy text. */
    17201733        $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>';
     1734
     1735        /* translators: default privacy policy heading. */
    17211736        $strings[] = '<h3>' . __( 'Media' ) . '</h3>';
    17221737
    17231738        if ( $description ) {
     1739            /* translators: privacy policy tutorial. */
    17241740            $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>';
    17251741        }
    17261742
     1743        /* translators: default privacy policy text. */
    17271744        $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>';
     1745
     1746        /* translators: default privacy policy heading. */
    17281747        $strings[] = '<h3>' . __( 'Contact forms' ) . '</h3>';
    17291748
    17301749        if ( $description ) {
     1750            /* translators: privacy policy tutorial. */
    17311751            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    17321752        }
    17331753
     1754        /* translators: default privacy policy heading. */
    17341755        $strings[] = '<h3>' . __( 'Cookies' ) . '</h3>';
    17351756
    17361757        if ( $description ) {
     1758            /* translators: privacy policy tutorial. */
    17371759            $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>';
    17381760        }
    17391761
     1762        /* translators: default privacy policy text. */
    17401763        $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>';
     1764        /* translators: default privacy policy text. */
    17411765        $strings[] = '<p>' . __( 'If you have an account and you log in to this site, 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.' ) . '</p>';
     1766        /* translators: default privacy policy text. */
    17421767        $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>';
     1768        /* translators: default privacy policy text. */
    17431769        $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>';
    17441770
     1771        /* translators: default privacy policy heading. */
    17451772        $strings[] = '<h3>' . __( 'Embedded content from other websites' ) . '</h3>';
     1773        /* translators: default privacy policy text. */
    17461774        $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>';
     1775        /* translators: default privacy policy text. */
    17471776        $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>';
    17481777
     1778        /* translators: default privacy policy heading. */
    17491779        $strings[] = '<h3>' . __( 'Analytics' ) . '</h3>';
    17501780
    17511781        if ( $description ) {
     1782            /* translators: privacy policy tutorial. */
    17521783            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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&#8217;s privacy policy, if any.' ) . '</p>';
     1784            /* translators: privacy policy tutorial. */
    17531785            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>';
    17541786        }
    17551787
     1788        /* translators: default privacy policy heading. */
    17561789        $strings[] = '<h2>' . __( 'Who we share your data with' ) . '</h2>';
    17571790
    17581791        if ( $description ) {
     1792            /* translators: privacy policy tutorial. */
    17591793            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>';
     1794            /* translators: privacy policy tutorial. */
    17601795            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>';
    17611796        }
    17621797
     1798        /* translators: default privacy policy heading. */
    17631799        $strings[] = '<h2>' . __( 'How long we retain your data' ) . '</h2>';
    17641800       
    17651801        if ( $description ) {
     1802            /* translators: privacy policy tutorial. */
    17661803            $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>';
    17671804        }
    1768        
     1805
     1806        /* translators: default privacy policy text. */
    17691807        $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>';
     1808        /* translators: default privacy policy text. */
    17701809        $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>';
    17711810
     1811        /* translators: default privacy policy heading. */
    17721812        $strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
    17731813
    17741814        if ( $description ) {
     1815            /* translators: privacy policy tutorial. */
    17751816            $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>';
    17761817        }
    17771818
     1819        /* translators: default privacy policy text. */
    17781820        $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>';
    17791821
     1822        /* translators: default privacy policy heading. */
    17801823        $strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>';
    17811824
    17821825        if ( $description ) {
     1826            /* translators: privacy policy tutorial. */
    17831827            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>';
     1828            /* translators: privacy policy tutorial. */
    17841829            $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>';
    17851830        }
    17861831
     1832        /* translators: default privacy policy text. */
    17871833        $strings[] = '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>';
    17881834
     1835        /* translators: default privacy policy heading. */
    17891836        $strings[] = '<h2>' . __( 'Your contact information' ) . '</h2>';
    17901837
    17911838        if ( $description ) {
     1839            /* translators: privacy policy tutorial. */
    17921840            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    17931841        }
    17941842
     1843        /* translators: default privacy policy heading. */
    17951844        $strings[] = '<h2>' . __( 'Additional information' ) . '</h2>';
    17961845
    17971846        if ( $description ) {
     1847            /* translators: privacy policy tutorial. */
    17981848            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    17991849        }
    18001850
     1851        /* translators: default privacy policy heading. */
    18011852        $strings[] = '<h3>' . __( 'How we protect your data' ) . '</h3>';
    18021853
    18031854        if ( $description ) {
     1855            /* translators: privacy policy tutorial. */
    18041856            $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; 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.' ) . '</p>';
    18051857        }
    18061858
     1859        /* translators: default privacy policy heading. */
    18071860        $strings[] = '<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>';
    18081861
    18091862        if ( $description ) {
     1863            /* translators: privacy policy tutorial. */
    18101864            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    18111865        }
    18121866
     1867        /* translators: default privacy policy heading. */
    18131868        $strings[] = '<h3>' . __( 'What third parties we receive data from' ) . '</h3>';
    18141869
    18151870        if ( $description ) {
     1871            /* translators: privacy policy tutorial. */
    18161872            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    18171873        }
    18181874
     1875        /* translators: default privacy policy heading. */
    18191876        $strings[] = '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>';
    18201877
    18211878        if ( $description ) {
     1879            /* translators: privacy policy tutorial. */
    18221880            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>';
    18231881        }
    18241882
     1883        /* translators: default privacy policy heading. */
    18251884        $strings[] = '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
    18261885
    18271886        if ( $description ) {
     1887            /* translators: privacy policy tutorial. */
    18281888            $strings[] = '<p class="privacy-policy-tutorial">' . __( '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>';
    18291889            $strings[] = '</div>';

  • branches/5.0/src/wp-admin/includes/upgrade.php

    r43820 r43912  
    160160
    161161        if ( ! $first_post ) {
    162             /* translators: %s: site link */
    163             $first_post = __( '<!-- wp:paragraph -->
    164 <p>Welcome to %s. This is your first post. Edit or delete it, then start writing!</p>
    165 <!-- /wp:paragraph -->' );
     162            $first_post = "<!-- wp:paragraph -->\n<p>" .
     163                /* translators: first post content, %s: site link */
     164                __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ) .
     165                "</p>\n<!-- /wp:paragraph -->";
    166166        }
    167167
    … …  
    174174        $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
    175175    } else {
    176         $first_post = __( '<!-- wp:paragraph -->
    177 <p>Welcome to WordPress. This is your first post. Edit or delete it, then start writing!</p>
    178 <!-- /wp:paragraph -->' );
     176        $first_post = "<!-- wp:paragraph -->\n<p>" .
     177            /* translators: first post content, %s: site link */
     178            __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ) .
     179            "</p>\n<!-- /wp:paragraph -->";
    179180    }
    180181
    … …  
    226227        $first_page = get_site_option( 'first_page' );
    227228
    228     $first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "<!-- wp:paragraph -->
    229 <p>This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:</p>
    230 <!-- /wp:paragraph -->
    231 
    232 <!-- wp:quote -->
    233 <blockquote class=\"wp-block-quote\"><p>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</p></blockquote>
    234 <!-- /wp:quote -->
    235 
    236 <!-- wp:paragraph -->
    237 <p>...or something like this:</p>
    238 <!-- /wp:paragraph -->
    239 
    240 <!-- wp:quote -->
    241 <blockquote class=\"wp-block-quote\"><p>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</p></blockquote>
    242 <!-- /wp:quote -->
    243 
    244 <!-- wp:paragraph -->
    245 <p>As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!</p>
    246 <!-- /wp:paragraph -->" ), admin_url() );
     229    if ( empty( $first_page ) ) {
     230        $first_page = "<!-- wp:paragraph -->\n<p>";
     231        /* translators: first page content */
     232        $first_page .= __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:" );
     233        $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
     234
     235        $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
     236        /* translators: first page content */
     237        $first_page .= __( "Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)" );
     238        $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
     239
     240        $first_page .= "<!-- wp:paragraph -->\n<p>";
     241        /* translators: first page content */
     242        $first_page .= __( '...or something like this:' );
     243        $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
     244
     245        $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
     246        /* translators: first page content */
     247        $first_page .= __( 'The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.' );
     248        $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
     249
     250        $first_page .= "<!-- wp:paragraph -->\n<p>";
     251        $first_page .= sprintf(
     252            /* translators: first page content, %s: site admin URL */
     253            __( 'As a new WordPress user, you should go to <a href="%s">your dashboard</a> to delete this page and create new pages for your content. Have fun!' ),
     254            admin_url()
     255        );
     256        $first_page .= "</p>\n<!-- /wp:paragraph -->";
     257    }
    247258
    248259    $first_post_guid = get_option('home') . '/?page_id=2';
Note: See TracChangeset for help on using the changeset viewer.