<!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>[48274] trunk/src: I18N: Use `wp.i18n` for translatable strings in `wp-admin/js/privacy-tools.js`.</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/48274">48274</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/48274","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>2020-07-02 11:09:23 +0000 (Thu, 02 Jul 2020)</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'>I18N: Use `wp.i18n` for translatable strings in `wp-admin/js/privacy-tools.js`.
This removes the usage of `wp_localize_script()` for passing translations to the script and instead adds the translatable strings in the script directly through the use of `wp.i18n` and its utilities.
Props swissspidy, ocean90, afercia.
See <a href="https://core.trac.wordpress.org/ticket/20491">#20491</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/50535">#50535</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminprivacytoolsjs">trunk/src/js/_enqueues/admin/privacy-tools.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminprivacytoolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/privacy-tools.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/privacy-tools.js 2020-07-02 05:55:04 UTC (rev 48273)
+++ trunk/src/js/_enqueues/admin/privacy-tools.js 2020-07-02 11:09:23 UTC (rev 48274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Privacy request action handling.
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( document ).ready( function( $ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var strings = window.privacyToolsL10n || {},
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var __ = wp.i18n.__,
</ins><span class="cx" style="display: block; padding: 0 10px"> copiedNoticeTimeout;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function setActionState( $action, state ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setExportProgress( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function onExportDoneSuccess( zipUrl ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var summaryMessage = strings.emailSent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var summaryMessage = __( 'The personal data export link for this user was sent.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setActionState( $action, 'export-personal-data-success' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== typeof zipUrl ) {
</span><span class="cx" style="display: block; padding: 0 10px"> window.location = zipUrl;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! sendAsEmail ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- onExportFailure( strings.noExportFile );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ onExportFailure( __( 'No personal data export file was generated.' ) );
</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"> setTimeout( function() { $rowActions.removeClass( 'processing' ); }, 500 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,9 +93,12 @@
</span><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"> function onExportFailure( errorMessage ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var summaryMessage = __( 'An error occurred while attempting to export personal data.' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setActionState( $action, 'export-personal-data-failed' );
</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 ( errorMessage ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- appendResultsAfterRow( $requestRow, 'notice-error', strings.exportError, [ errorMessage ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ appendResultsAfterRow( $requestRow, 'notice-error', summaryMessage, [ errorMessage ] );
</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"> setTimeout( function() { $rowActions.removeClass( 'processing' ); }, 500 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setErasureProgress( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function onErasureDoneSuccess() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var summaryMessage = strings.noDataFound,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var summaryMessage = __( 'No personal data was found for this user.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> classes = 'notice-success';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setActionState( $action, 'remove-personal-data-success' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,16 +185,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === hasRemoved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === hasRetained ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- summaryMessage = strings.noDataFound;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ summaryMessage = __( 'No personal data was found for this user.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- summaryMessage = strings.noneRemoved;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ summaryMessage = __( 'Personal data was found for this user but was not erased.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> classes = 'notice-warning';
</span><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"> if ( false === hasRetained ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- summaryMessage = strings.foundAndRemoved;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ summaryMessage = __( 'All of the personal data found for this user was erased.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- summaryMessage = strings.someNotRemoved;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ summaryMessage = __( 'Personal data was found for this user but some of the personal data found was not erased.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> classes = 'notice-warning';
</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">@@ -201,9 +204,12 @@
</span><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"> function onErasureFailure() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var summaryMessage = __( 'An error occurred while attempting to find and erase personal data.' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setActionState( $action, 'remove-personal-data-failed' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- appendResultsAfterRow( $requestRow, 'notice-error', strings.removalError, [] );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ appendResultsAfterRow( $requestRow, 'notice-error', summaryMessage, [] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() { $rowActions.removeClass( 'processing' ); }, 500 );
</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">@@ -267,7 +273,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var $parent,
</span><span class="cx" style="display: block; padding: 0 10px"> $container,
</span><span class="cx" style="display: block; padding: 0 10px"> range,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __ = wp.i18n.__,
</del><span class="cx" style="display: block; padding: 0 10px"> $target = $( event.target ),
</span><span class="cx" style="display: block; padding: 0 10px"> copiedNotice = $target.siblings( '.success' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2020-07-02 05:55:04 UTC (rev 48273)
+++ trunk/src/wp-includes/script-loader.php 2020-07-02 11:09:23 UTC (rev 48274)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1205,8 +1205,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // To enqueue media-views or media-editor, call wp_enqueue_media().
</span><span class="cx" style="display: block; padding: 0 10px"> // Both rely on numerous settings, styles, and templates to operate correctly.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y', 'wp-i18n', 'clipboard' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y', 'clipboard' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'media-views' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1379,24 +1380,11 @@
</span><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-i18n' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'site-health' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'privacy-tools', "/wp-admin/js/privacy-tools$suffix.js", array( 'jquery', 'wp-a11y', 'wp-i18n' ), false, 1 );
- did_action( 'init' ) && $scripts->localize(
- 'privacy-tools',
- 'privacyToolsL10n',
- array(
- 'noDataFound' => __( 'No personal data was found for this user.' ),
- 'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
- 'noneRemoved' => __( 'Personal data was found for this user but was not erased.' ),
- 'someNotRemoved' => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
- 'removalError' => __( 'An error occurred while attempting to find and erase personal data.' ),
- 'emailSent' => __( 'The personal data export link for this user was sent.' ),
- 'noExportFile' => __( 'No personal data export file was generated.' ),
- 'exportError' => __( 'An error occurred while attempting to export personal data.' ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'privacy-tools', "/wp-admin/js/privacy-tools$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
+ $scripts->set_translations( 'privacy-tools' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y', 'wp-sanitize' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'updates' );
</span></span></pre>
</div>
</div>
</body>
</html>