<!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>[45062] trunk: Privacy: Ensure the personal data export email is sent in the locale of the user whose data is being exported (or the site's default locale if they are not a registered user) when the administrator fulfilling the request uses a different locale.</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="https://core.trac.wordpress.org/changeset/45062">45062</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45062","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-28 21:28:37 +0000 (Thu, 28 Mar 2019)</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'>Privacy: Ensure the personal data export email is sent in the locale of the user whose data is being exported (or the site's default locale if they are not a registered user) when the administrator fulfilling the request uses a different locale.
Props garrett-eclipse.
Fixes <a href="https://core.trac.wordpress.org/ticket/46056">#46056</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunktestsphpunitdatalanguagesde_DEmo">trunk/tests/phpunit/data/languages/de_DE.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguagesde_DEpo">trunk/tests/phpunit/data/languages/de_DE.po</a></li>
<li><a href="#trunktestsphpunitdatalanguageses_ESmo">trunk/tests/phpunit/data/languages/es_ES.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguageses_ESpo">trunk/tests/phpunit/data/languages/es_ES.po</a></li>
<li><a href="#trunktestsphpunittestsprivacywpPrivacySendPersonalDataExportEmailphp">trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2019-03-28 21:26:20 UTC (rev 45061)
+++ trunk/src/wp-admin/includes/file.php 2019-03-28 21:28:37 UTC (rev 45062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2353,6 +2353,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_request', __( 'Invalid request ID when sending personal data export email.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Localize message content for user; fallback to site default for visitors.
+ if ( ! empty( $request->user_id ) ) {
+ $locale = get_user_locale( $request->user_id );
+ } else {
+ $locale = get_locale();
+ }
+
+ $switched_locale = switch_to_locale( $locale );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/functions.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2409,6 +2418,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $mail_success ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'privacy_email_error', __( 'Unable to send personal data export email.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagesde_DEmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/de_DE.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagesde_DEpo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/de_DE.po</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/languages/de_DE.po 2019-03-28 21:26:20 UTC (rev 45061)
+++ trunk/tests/phpunit/data/languages/de_DE.po 2019-03-28 21:28:37 UTC (rev 45062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Translation of 4.9.x in German
-# This file is distributed under the same license as the 4.9.x package.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Translation of 5.2.x in German
+# This file is distributed under the same license as the 5.2.x package.
</ins><span class="cx" style="display: block; padding: 0 10px"> msgid ""
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"PO-Revision-Date: 2019-03-27 22:27+0300\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"PO-Revision-Date: 2019-03-28 19:42+0300\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "MIME-Version: 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Type: text/plain; charset=UTF-8\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Transfer-Encoding: 8bit\n"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,3 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #: wp-includes/user.php:3175
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "[%s] Erasure Request Fulfilled"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr "[%s] Löschauftrag ausgeführt"
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+#: wp-admin/includes/file.php:2415
+msgid "[%s] Personal Data Export"
+msgstr "[%s] Export personenbezogener Daten"
</ins></span></pre></div>
<a id="trunktestsphpunitdatalanguageses_ESmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/es_ES.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguageses_ESpo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/es_ES.po</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/languages/es_ES.po 2019-03-28 21:26:20 UTC (rev 45061)
+++ trunk/tests/phpunit/data/languages/es_ES.po 2019-03-28 21:28:37 UTC (rev 45062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Translation of Development (4.9.x) in Spanish (Spain)
-# This file is distributed under the same license as the Development (4.9.x) package.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Translation of Development (5.2.x) in Spanish (Spain)
+# This file is distributed under the same license as the Development (5.2.x) package.
</ins><span class="cx" style="display: block; padding: 0 10px"> msgid ""
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"PO-Revision-Date: 2019-03-27 22:27+0300\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"PO-Revision-Date: 2019-03-28 19:43+0300\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "MIME-Version: 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Type: text/plain; charset=UTF-8\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Transfer-Encoding: 8bit\n"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,3 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #: wp-includes/user.php:3175
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "[%s] Erasure Request Fulfilled"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr "[%s] Solicitud de borrado completada"
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+#: wp-admin/includes/file.php:2415
+msgid "[%s] Personal Data Export"
+msgstr "[%s] Exportación de datos personales"
</ins></span></pre></div>
<a id="trunktestsphpunittestsprivacywpPrivacySendPersonalDataExportEmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php 2019-03-28 21:26:20 UTC (rev 45061)
+++ trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php 2019-03-28 21:28:37 UTC (rev 45062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +35,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $requester_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Request user.
+ *
+ * @since 5.2.0
+ *
+ * @var WP_User $request_user
+ */
+ protected static $request_user;
+
+ /**
+ * Test administrator user.
+ *
+ * @since 5.2.0
+ *
+ * @var WP_User $admin_user
+ */
+ protected static $admin_user;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Reset the mocked phpmailer instance before each test method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function tearDown() {
</span><span class="cx" style="display: block; padding: 0 10px"> reset_phpmailer_instance();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restore_previous_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</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">@@ -63,6 +82,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$requester_email = 'requester@example.com';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$request_user = $factory->user->create_and_get(
+ array(
+ 'user_email' => self::$requester_email,
+ 'role' => 'subscriber',
+ )
+ );
+ self::$admin_user = $factory->user->create_and_get(
+ array(
+ 'user_email' => 'admin@local.dev',
+ 'role' => 'administrator',
+ )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$request_id = wp_create_user_request( self::$requester_email, 'export_personal_data' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_privacy_account_request_confirmed( self::$request_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,4 +199,136 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function modify_email_content( $email_text, $request_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'Custom content for request ID: ' . $request_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * The function should respect the user locale settings when the site uses the default locale.
+ *
+ * @since 5.2.0
+ * @ticket 46056
+ * @group l10n
+ */
+ public function test_should_send_personal_data_export_email_in_user_locale() {
+ update_user_meta( self::$request_user->ID, 'locale', 'es_ES' );
+
+ wp_privacy_send_personal_data_export_email( self::$request_id );
+
+ $mailer = tests_retrieve_phpmailer_instance();
+
+ $this->assertContains( 'Exportación de datos personales', $mailer->get_sent()->subject );
+ }
+
+ /**
+ * The function should respect the user locale settings when the site does not use en_US, the administrator
+ * uses the site's default locale, and the user has a different locale.
+ *
+ * @since 5.2.0
+ * @ticket 46056
+ * @group l10n
+ */
+ public function test_should_send_personal_data_export_email_in_user_locale_when_site_is_not_en_us() {
+ update_option( 'WPLANG', 'es_ES' );
+ switch_to_locale( 'es_ES' );
+
+ update_user_meta( self::$request_user->ID, 'locale', 'de_DE' );
+ wp_set_current_user( self::$admin_user->ID );
+
+ wp_privacy_send_personal_data_export_email( self::$request_id );
+
+ $mailer = tests_retrieve_phpmailer_instance();
+
+ $this->assertContains( 'Export personenbezogener Daten', $mailer->get_sent()->subject );
+ }
+
+ /**
+ * The function should respect the user locale settings when the site is not en_US, the administrator
+ * has a different selected locale, and the user uses the site's default locale.
+ *
+ * @since 5.2.0
+ * @ticket 46056
+ * @group l10n
+ */
+ public function test_should_send_personal_data_export_email_in_user_locale_when_admin_and_site_have_different_locales() {
+ update_option( 'WPLANG', 'es_ES' );
+ switch_to_locale( 'es_ES' );
+
+ update_user_meta( self::$admin_user->ID, 'locale', 'de_DE' );
+ wp_set_current_user( self::$admin_user->ID );
+
+ wp_privacy_send_personal_data_export_email( self::$request_id );
+
+ $mailer = tests_retrieve_phpmailer_instance();
+
+ $this->assertContains( 'Exportación de datos personales', $mailer->get_sent()->subject );
+ }
+
+ /**
+ * The function should respect the user locale settings when the site is not en_US and both the
+ * administrator and the user use different locales.
+ *
+ * @since 5.2.0
+ * @ticket 46056
+ * @group l10n
+ */
+ public function test_should_send_personal_data_export_email_in_user_locale_when_both_have_different_locales_than_site() {
+ update_option( 'WPLANG', 'es_ES' );
+ switch_to_locale( 'es_ES' );
+
+ update_user_meta( self::$admin_user->ID, 'locale', 'en_US' );
+ update_user_meta( self::$request_user->ID, 'locale', 'de_DE' );
+
+ wp_set_current_user( self::$admin_user->ID );
+
+ wp_privacy_send_personal_data_export_email( self::$request_id );
+
+ $mailer = tests_retrieve_phpmailer_instance();
+
+ $this->assertContains( 'Export personenbezogener Daten', $mailer->get_sent()->subject );
+ }
+
+ /**
+ * The function should respect the site's locale when the request is for an unregistered user and the
+ * administrator does not use the site's locale.
+ *
+ * @since 5.2.0
+ * @ticket 46056
+ * @group l10n
+ */
+ public function test_should_send_personal_data_export_email_in_site_locale() {
+ update_user_meta( self::$admin_user->ID, 'locale', 'es_ES' );
+ wp_set_current_user( self::$admin_user->ID );
+
+ $request_id = wp_create_user_request( 'export-user-not-registered@example.com', 'export_personal_data' );
+
+ _wp_privacy_account_request_confirmed( self::$request_id );
+ wp_privacy_send_personal_data_export_email( $request_id );
+
+ $mailer = tests_retrieve_phpmailer_instance();
+
+ $this->assertContains( 'Personal Data Export', $mailer->get_sent()->subject );
+ }
+
+ /**
+ * The function should respect the site's locale when it is not en_US, the request is for an
+ * unregistered user, and the administrator does not use the site's default locale.
+ *
+ * @since 5.2.0
+ * @ticket 46056
+ * @group l10n
+ */
+ public function test_should_send_personal_data_export_email_in_site_locale_when_not_en_us_and_admin_has_different_locale() {
+ update_option( 'WPLANG', 'es_ES' );
+ switch_to_locale( 'es_ES' );
+
+ update_user_meta( self::$admin_user->ID, 'locale', 'de_DE' );
+ wp_set_current_user( self::$admin_user->ID );
+
+ $request_id = wp_create_user_request( 'export-user-not-registered@example.com', 'export_personal_data' );
+
+ _wp_privacy_account_request_confirmed( self::$request_id );
+ wp_privacy_send_personal_data_export_email( $request_id );
+
+ $mailer = tests_retrieve_phpmailer_instance();
+
+ $this->assertContains( 'Exportación de datos personales', $mailer->get_sent()->subject );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>