Changeset 43912
- Timestamp:
- 11/21/2018 01:47:49 AM (10 months ago)
- Location:
- branches/5.0/src/wp-admin/includes
- Files:
-
- 2 edited
-
misc.php (modified) (1 diff)
-
upgrade.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/5.0/src/wp-admin/includes/misc.php
r43820 r43912 1691 1691 } 1692 1692 1693 /* translators: default privacy policy heading. */ 1693 1694 $strings[] = '<h2>' . __( 'Who we are' ) . '</h2>'; 1694 1695 1695 1696 if ( $description ) { 1697 /* translators: privacy policy tutorial. */ 1696 1698 $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. */ 1697 1700 $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>'; 1698 1701 } 1699 1702 1700 /* translators: %s Site URL*/1703 /* translators: default privacy policy text, %s Site URL. */ 1701 1704 $strings[] = '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>'; 1702 1705 1706 /* translators: default privacy policy heading. */ 1703 1707 $strings[] = '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>'; 1704 1708 1705 1709 if ( $description ) { 1710 /* translators: privacy policy tutorial. */ 1706 1711 $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. */ 1707 1713 $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. */ 1708 1715 $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. */ 1709 1717 $strings[] = '<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user’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. */ 1710 1719 $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>'; 1711 1720 } 1712 1721 1722 /* translators: default privacy policy heading. */ 1713 1723 $strings[] = '<h3>' . __( 'Comments' ) . '</h3>'; 1714 1724 1715 1725 if ( $description ) { 1726 /* translators: privacy policy tutorial. */ 1716 1727 $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>'; 1717 1728 } 1718 1729 1730 /* translators: default privacy policy text. */ 1719 1731 $strings[] = '<p>' . $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.' ) . '</p>'; 1732 /* translators: default privacy policy text. */ 1720 1733 $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. */ 1721 1736 $strings[] = '<h3>' . __( 'Media' ) . '</h3>'; 1722 1737 1723 1738 if ( $description ) { 1739 /* translators: privacy policy tutorial. */ 1724 1740 $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>'; 1725 1741 } 1726 1742 1743 /* translators: default privacy policy text. */ 1727 1744 $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. */ 1728 1747 $strings[] = '<h3>' . __( 'Contact forms' ) . '</h3>'; 1729 1748 1730 1749 if ( $description ) { 1750 /* translators: privacy policy tutorial. */ 1731 1751 $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>'; 1732 1752 } 1733 1753 1754 /* translators: default privacy policy heading. */ 1734 1755 $strings[] = '<h3>' . __( 'Cookies' ) . '</h3>'; 1735 1756 1736 1757 if ( $description ) { 1758 /* translators: privacy policy tutorial. */ 1737 1759 $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>'; 1738 1760 } 1739 1761 1762 /* translators: default privacy policy text. */ 1740 1763 $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. */ 1741 1765 $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. */ 1742 1767 $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 "Remember Me", 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. */ 1743 1769 $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>'; 1744 1770 1771 /* translators: default privacy policy heading. */ 1745 1772 $strings[] = '<h3>' . __( 'Embedded content from other websites' ) . '</h3>'; 1773 /* translators: default privacy policy text. */ 1746 1774 $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. */ 1747 1776 $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>'; 1748 1777 1778 /* translators: default privacy policy heading. */ 1749 1779 $strings[] = '<h3>' . __( 'Analytics' ) . '</h3>'; 1750 1780 1751 1781 if ( $description ) { 1782 /* translators: privacy policy tutorial. */ 1752 1783 $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’s privacy policy, if any.' ) . '</p>'; 1784 /* translators: privacy policy tutorial. */ 1753 1785 $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>'; 1754 1786 } 1755 1787 1788 /* translators: default privacy policy heading. */ 1756 1789 $strings[] = '<h2>' . __( 'Who we share your data with' ) . '</h2>'; 1757 1790 1758 1791 if ( $description ) { 1792 /* translators: privacy policy tutorial. */ 1759 1793 $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. */ 1760 1795 $strings[] = '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>'; 1761 1796 } 1762 1797 1798 /* translators: default privacy policy heading. */ 1763 1799 $strings[] = '<h2>' . __( 'How long we retain your data' ) . '</h2>'; 1764 1800 1765 1801 if ( $description ) { 1802 /* translators: privacy policy tutorial. */ 1766 1803 $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>'; 1767 1804 } 1768 1805 1806 /* translators: default privacy policy text. */ 1769 1807 $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. */ 1770 1809 $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>'; 1771 1810 1811 /* translators: default privacy policy heading. */ 1772 1812 $strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>'; 1773 1813 1774 1814 if ( $description ) { 1815 /* translators: privacy policy tutorial. */ 1775 1816 $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>'; 1776 1817 } 1777 1818 1819 /* translators: default privacy policy text. */ 1778 1820 $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>'; 1779 1821 1822 /* translators: default privacy policy heading. */ 1780 1823 $strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>'; 1781 1824 1782 1825 if ( $description ) { 1826 /* translators: privacy policy tutorial. */ 1783 1827 $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. */ 1784 1829 $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>'; 1785 1830 } 1786 1831 1832 /* translators: default privacy policy text. */ 1787 1833 $strings[] = '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>'; 1788 1834 1835 /* translators: default privacy policy heading. */ 1789 1836 $strings[] = '<h2>' . __( 'Your contact information' ) . '</h2>'; 1790 1837 1791 1838 if ( $description ) { 1839 /* translators: privacy policy tutorial. */ 1792 1840 $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>'; 1793 1841 } 1794 1842 1843 /* translators: default privacy policy heading. */ 1795 1844 $strings[] = '<h2>' . __( 'Additional information' ) . '</h2>'; 1796 1845 1797 1846 if ( $description ) { 1847 /* translators: privacy policy tutorial. */ 1798 1848 $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>'; 1799 1849 } 1800 1850 1851 /* translators: default privacy policy heading. */ 1801 1852 $strings[] = '<h3>' . __( 'How we protect your data' ) . '</h3>'; 1802 1853 1803 1854 if ( $description ) { 1855 /* translators: privacy policy tutorial. */ 1804 1856 $strings[] = '<p class="privacy-policy-tutorial">' . __( '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.' ) . '</p>'; 1805 1857 } 1806 1858 1859 /* translators: default privacy policy heading. */ 1807 1860 $strings[] = '<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>'; 1808 1861 1809 1862 if ( $description ) { 1863 /* translators: privacy policy tutorial. */ 1810 1864 $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>'; 1811 1865 } 1812 1866 1867 /* translators: default privacy policy heading. */ 1813 1868 $strings[] = '<h3>' . __( 'What third parties we receive data from' ) . '</h3>'; 1814 1869 1815 1870 if ( $description ) { 1871 /* translators: privacy policy tutorial. */ 1816 1872 $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>'; 1817 1873 } 1818 1874 1875 /* translators: default privacy policy heading. */ 1819 1876 $strings[] = '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>'; 1820 1877 1821 1878 if ( $description ) { 1879 /* translators: privacy policy tutorial. */ 1822 1880 $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>'; 1823 1881 } 1824 1882 1883 /* translators: default privacy policy heading. */ 1825 1884 $strings[] = '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>'; 1826 1885 1827 1886 if ( $description ) { 1887 /* translators: privacy policy tutorial. */ 1828 1888 $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>'; 1829 1889 $strings[] = '</div>'; -
branches/5.0/src/wp-admin/includes/upgrade.php
r43820 r43912 160 160 161 161 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 -->"; 166 166 } 167 167 … … 174 174 $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post ); 175 175 } 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 -->"; 179 180 } 180 181 … … 226 227 $first_page = get_site_option( 'first_page' ); 227 228 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ñ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ñ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 } 247 258 248 259 $first_post_guid = get_option('home') . '/?page_id=2';
Note: See TracChangeset
for help on using the changeset viewer.