<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[7225] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main: Main: Privacy: Add translated page titles and meta descriptions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/7225">7225</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7225","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-24 10:40:29 +0000 (Thu, 24 May 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Main: Privacy: Add translated page titles and meta descriptions. Translate the form error strings and a few others that were missed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincprivacyfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataexportrequestphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php 2018-05-24 07:45:59 UTC (rev 7224)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php 2018-05-24 10:40:29 UTC (rev 7225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,6 +108,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = esc_html__( 'Democratize Publishing', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $desc = esc_html__( 'WordPress is software designed for everyone with emphasis on accessibility, performance, security, and usability.', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ case 'page-about-privacy-data-erasure-request.php':
+ $title = esc_html_x( 'Data Erasure Request', 'Page title', 'wporg' );
+ $desc = esc_html__( 'WordPress.org respects your privacy and intends to remain transparent about any personal data we store about individuals. Under the General Data Protection Regulation (GDPR), EU citizens and residents may request deletion of personal data stored on our servers.', 'wporg' );
+ break;
+
+ case 'page-about-privacy-data-export-request.php':
+ $title = esc_html_x( 'Data Export Request', 'Page title', 'wporg' );
+ $desc = esc_html__( 'WordPress.org respects your privacy and intends to remain transparent about any personal data we store about individuals. Under the General Data Protection Regulation (GDPR), EU citizens and residents are entitled to receive a copy of any personal data we might hold about you.', 'wporg' );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tags['og:title'] = $title;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,6 +210,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'page-about.php':
</span><span class="cx" style="display: block; padding: 0 10px"> $title = esc_html_x( 'About', 'Page title', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ case 'page-about-privacy-data-erasure-request.php':
+ $title = esc_html_x( 'Data Erasure Request', 'Page title', 'wporg' );
+ break;
+
+ case 'page-about-privacy-data-export-request.php':
+ $title = esc_html_x( 'Data Export Request', 'Page title', 'wporg' );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $title;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincprivacyfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php 2018-05-24 07:45:59 UTC (rev 7224)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/privacy-functions.php 2018-05-24 10:40:29 UTC (rev 7225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,18 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Currently only enabled for special accounts.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() || ! wporg_user_has_restricted_password() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $api_request = new \WP_Error(
- 'not_available',
- 'This form is currently disabled.'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_message = 'This form is currently unavailable.';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! reCAPTCHA\check_status() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error_message = 'Your form session has expired. Please try again.';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_message = esc_html__( 'Your form session has expired. Please try again.', 'wporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><span class="cx" style="display: block; padding: 0 10px"> is_user_logged_in() &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! wp_verify_nonce( $_POST['_wpnonce'], $nonce_action )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error_message = 'Your form session has expired. Please try again.';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_message = esc_html__( 'Your form session has expired. Please try again.', 'wporg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if a user account exists for this email before processing.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,13 +40,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_message = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'The provided email address belongs to a different WordPress.org account. Please <a href="%1$s">log out</a> and <a href="%2$s">login to the account first</a>.',
- wp_logout_url( get_permalink() ),
- wp_login_url( get_permalink() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: link to the Login form */
+ __( 'The provided email address belongs to a different WordPress.org account. Please <a href="%s">login to the account first</a>.', 'wporg' ),
+ wp_logout_url( wp_login_url( get_permalink() ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_message = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'The provided email address belongs to a WordPress.org account. Please <a href="%s">login to the account first</a>.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: link to the Login form */
+ __( 'The provided email address belongs to a WordPress.org account. Please <a href="%s">login to the account first</a>.', 'wporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_login_url( get_permalink() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,10 +74,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'duplicate_request' == $api_request->get_error_code() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO This should never have to be displayed to an end user. See API for details.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error_message = 'A request for this email address already exists. Please check your spam folder for your confirmation email.';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_message = esc_html__( 'A request for this email address already exists. Please check your spam folder for your confirmation email.', 'wporg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'invalid_identifier' == $api_request->get_error_code() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error_message = 'The provided email was invalid. Please check the address and try again.';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_message = esc_html__( 'The provided email was invalid. Please check the address and try again.', 'wporg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( !empty( $api_request['created'] ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php 2018-05-24 07:45:59 UTC (rev 7224)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php 2018-05-24 10:40:29 UTC (rev 7225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email = wp_get_current_user()->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// TODO See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// See inc/page-meta-descriptions.php for the meta description for this page.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Move to Theme once styled.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-left: 4px solid green;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 6px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ form.request-form label {
+ display: block;
+ color: #555;
+ font-size: 0.8em;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> form.request-form input[type="email"] {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 75%;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 100%;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>';
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,13 +88,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'This will request permanent deletion of your WordPress.org account, and relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php /* translators: link to privacy policy. */ ?>
- <p><?php printf( esc_html__( 'Not all data can be erased, please review the %s for details.', 'wporg' ), '<a href="/about/privacy/">Privacy Policy</a>' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php
+ printf(
+ /* translators: link to privacy policy. */
+ esc_html__( 'Not all data can be erased, please review the %s for details.', 'wporg' ),
+ '<a href="/about/privacy/">' . esc_html_x( 'Privacy Policy', 'Page title', 'wporg' ) . '</a>'
+ );
+ ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $error_message ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="error"><strong>An error occured with your request:</strong> <?php echo $error_message; ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <p class="error">
+ <strong><?php esc_html_e( 'An error occured with your request:', 'wporg' ); ?></strong><br>
+ <?php echo $error_message; ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $success ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="success"><strong>Please check your email for a confirmation link.</strong></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="error">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,23 +118,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="erase-request-form" class="request-form" method="POST" action="#">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="email">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Email Address
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Email Address', 'wporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input
</span><span class="cx" style="display: block; padding: 0 10px"> type="email"
</span><span class="cx" style="display: block; padding: 0 10px"> name="email" id="email"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- placeholder="you@example.com"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ placeholder="<?php
+ /* translators: Example placeholder email address */
+ esc_attr_e( 'you@example.com', 'wporg' )
+ ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> required
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $email ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <br>
</del><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true. You also declare that it is your intention for accounts associated with that email address to be permanently deleted.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <br/>
- <?php reCAPTCHA\display_submit_button( esc_attr__( 'Accept Declaration and Request Permanent Account Deletion', 'wporg' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Permanent Account Deletion', 'wporg' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong>Please note:</strong> <?php esc_html_e( 'Before we can begin processing your request, we\'ll require that you verify ownership of the email address. If the email address is associated with an account, we\'ll also require you to login to that account first.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( "Please Note: Before we can begin processing your request, we'll require that you verify ownership of the email address. If the email address is associated with an account, we'll also require you to login to that account first.", 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </section>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataexportrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php 2018-05-24 07:45:59 UTC (rev 7224)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-export-request.php 2018-05-24 10:40:29 UTC (rev 7225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email = wp_get_current_user()->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// TODO See inc/page-meta-descriptions.php for the meta description for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// See inc/page-meta-descriptions.php for the meta description for this page.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Move to Theme once styled.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-left: 4px solid green;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 6px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ form.request-form label {
+ display: block;
+ color: #555;
+ font-size: 0.8em;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> form.request-form input[type="email"] {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 75%;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 100%;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>';
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +90,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'This export will contain relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $error_message ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="error"><strong>An error occured with your request:</strong> <?php echo $error_message; ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="error">
+ <strong><?php esc_html_e( 'An error occured with your request:', 'wporg' ); ?></strong><br>
+ <?php echo $error_message; ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $success ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,23 +105,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="export-request-form" class="request-form" method="POST" action="#">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="email">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Email Address
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Email Address', 'wporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input
</span><span class="cx" style="display: block; padding: 0 10px"> type="email"
</span><span class="cx" style="display: block; padding: 0 10px"> name="email" id="email"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- placeholder="you@example.com"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ placeholder="<?php
+ /* translators: Example placeholder email address */
+ esc_attr_e( 'you@example.com', 'wporg' )
+ ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> required
</span><span class="cx" style="display: block; padding: 0 10px"> value="<?php echo esc_attr( $email ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <br>
</del><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'By submitting this form, you declare that you are the individual owner of the specified email address and its associated accounts; and that all submitted information including any supplemental details necessary to verify your identity are true.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <br />
- <?php reCAPTCHA\display_submit_button( esc_attr__( 'Accept Declaration and Request Export', 'wporg' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php reCAPTCHA\display_submit_button( __( 'Accept Declaration and Request Export', 'wporg' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong>Please note:</strong> <?php esc_html_e( 'Before we can begin processing your request, we\'ll require that you verify ownership of the email address. If the email address is associated with an account, we\'ll also require you to log in to that account first.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( "Please Note: Before we can begin processing your request, we'll require that you verify ownership of the email address. If the email address is associated with an account, we'll also require you to log in to that account first.", 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </section>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span></span></pre>
</div>
</div>
</body>
</html>