<!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>[48348] trunk/src: I18N: Use `wp.i18n` for translatable strings in `wp-admin/js/edit-comments.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/48348">48348</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/48348","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-06 20:15:46 +0000 (Mon, 06 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/edit-comments.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.
See <a href="https://core.trac.wordpress.org/ticket/20491">#20491</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/50578">#50578</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmineditcommentsjs">trunk/src/js/_enqueues/admin/edit-comments.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_enqueuesadmineditcommentsjs"></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/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/edit-comments.js 2020-07-06 19:45:04 UTC (rev 48347)
+++ trunk/src/js/_enqueues/admin/edit-comments.js 2020-07-06 20:15:46 UTC (rev 48348)
</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"> * @output wp-admin/js/edit-comments.js
</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">-/* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* global adminCommentsSettings, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
</ins><span class="cx" style="display: block; padding: 0 10px"> /* global commentReply, theExtraList, theList, setCommentsList */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var getCount, updateCount, updateCountText, updatePending, updateApproved,
</span><span class="cx" style="display: block; padding: 0 10px"> updateHtmlTitle, updateDashboardText, updateInModerationText, adminTitle = document.title,
</span><span class="cx" style="display: block; padding: 0 10px"> isDashboard = $('#dashboard_right_now').length,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- titleDiv, titleRegEx;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ titleDiv, titleRegEx,
+ __ = wp.i18n.__;
</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"> * Extracts a number from the content of a jQuery element.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +192,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> updateHtmlTitle = function( diff ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var newTitle, regExMatch, titleCount, commentFrag;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- titleRegEx = titleRegEx || new RegExp( adminCommentsL10n.docTitleCommentsCount.replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Comments count. */
+ titleRegEx = titleRegEx || new RegExp( __( 'Comments (%s)' ).replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Count funcs operate on a $'d element.
</span><span class="cx" style="display: block; padding: 0 10px"> titleDiv = titleDiv || $( '<div />' );
</span><span class="cx" style="display: block; padding: 0 10px"> newTitle = adminTitle;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,12 +212,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> updateCount( titleDiv, titleCount );
</span><span class="cx" style="display: block; padding: 0 10px"> regExMatch = titleRegEx.exec( document.title );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( regExMatch ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- newTitle = document.title.replace( regExMatch[0], adminCommentsL10n.docTitleCommentsCount.replace( '%s', titleDiv.text() ) + ' ' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Comments count. */
+ newTitle = document.title.replace( regExMatch[0], __( 'Comments (%s)' ).replace( '%s', titleDiv.text() ) + ' ' );
</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"> regExMatch = titleRegEx.exec( newTitle );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( regExMatch ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- newTitle = newTitle.replace( regExMatch[0], adminCommentsL10n.docTitleComments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ newTitle = newTitle.replace( regExMatch[0], __( 'Comments11' ) );
</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"> document.title = newTitle;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( c.is('.unapproved') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( settings.data.id == replyID )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- replyButton.text(adminCommentsL10n.replyApprove);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ replyButton.text( __( 'Approve and Reply' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> c.find( '.row-actions span.view' ).addClass( 'hidden' ).end()
</span><span class="cx" style="display: block; padding: 0 10px"> .find( 'div.comment_status' ).html( '0' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +370,7 @@
</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 ( settings.data.id == replyID )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- replyButton.text(adminCommentsL10n.reply);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ replyButton.text( __( 'Reply' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> c.find( '.row-actions span.view' ).removeClass( 'hidden' ).end()
</span><span class="cx" style="display: block; padding: 0 10px"> .find( 'div.comment_status' ).html( '1' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,7 +849,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> toggle : function(el) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( adminCommentsL10n.warnQuickEdit ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( __( 'Are you sure you want to edit this comment?\nThe changes you made will be lost.' ) ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( el ).find( 'button.vim-q' ).click();
</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">@@ -1007,9 +1010,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> c.after(editRow);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( c.hasClass('unapproved') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- replyButton.text(adminCommentsL10n.replyApprove);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ replyButton.text( __( 'Approve and Reply' ) );
</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">- replyButton.text(adminCommentsL10n.reply);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ replyButton.text( __( 'Reply' ) );
</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"> $('#replyrow').fadeIn(300, function(){ $(this).show(); });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- return window.confirm( adminCommentsL10n.warnCommentChanges );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return window.confirm( __( 'Are you sure you want to do this?\nThe comment changes you made will be lost.' ) );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1312,8 +1315,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ['shift+u', make_bulk('unapprove')]
</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">- highlight_first: adminCommentsL10n.hotkeys_highlight_first,
- highlight_last: adminCommentsL10n.hotkeys_highlight_last,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ highlight_first: adminCommentsSettings.hotkeys_highlight_first,
+ highlight_last: adminCommentsSettings.hotkeys_highlight_last,
</ins><span class="cx" style="display: block; padding: 0 10px"> prev_page_link_cb: make_hotkeys_redirect('prev'),
</span><span class="cx" style="display: block; padding: 0 10px"> next_page_link_cb: make_hotkeys_redirect('next'),
</span><span class="cx" style="display: block; padding: 0 10px"> hotkeys_opts: {
</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-06 19:45:04 UTC (rev 48347)
+++ trunk/src/wp-includes/script-loader.php 2020-07-06 20:15:46 UTC (rev 48348)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,19 +1196,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'admin-tags' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array( 'wp-lists', 'quicktags', 'jquery-query' ), false, 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->set_translations( 'admin-comments' );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin-comments',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'adminCommentsL10n',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'adminCommentsSettings',
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hotkeys_highlight_first' => isset( $_GET['hotkeys_highlight_first'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hotkeys_highlight_last' => isset( $_GET['hotkeys_highlight_last'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'replyApprove' => __( 'Approve and Reply' ),
- 'reply' => __( 'Reply' ),
- 'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
- 'warnCommentChanges' => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
- 'docTitleComments' => __( 'Comments' ),
- /* translators: %s: Comments count. */
- 'docTitleCommentsCount' => __( 'Comments (%s)' ),
</del><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></span></pre>
</div>
</div>
</body>
</html>