<!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>[55630] trunk/src/wp-admin: I18N: Correct translator comments placement in `wp-admin/edit-comments.php`.</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/55630">55630</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/55630","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>2023-04-06 16:42:40 +0000 (Thu, 06 Apr 2023)</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: Correct translator comments placement in `wp-admin/edit-comments.php`.
This ensures that the translator comments are displayed for the strings they refer to, e.g. to explain placeholders in comment action messages, and are not displayed for unrelated strings, e.g. "Undo", to avoid confusion.
Includes minor code layout fixes and wrapping a few long lines for better readability.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/35549">[35549]</a>, <a href="https://core.trac.wordpress.org/changeset/45926">[45926]</a>, <a href="https://core.trac.wordpress.org/changeset/45932">[45932]</a>.
Props afercia.
See <a href="https://core.trac.wordpress.org/ticket/57839">#57839</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditcommentsphp"></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/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2023-04-05 13:10:53 UTC (rev 55629)
+++ trunk/src/wp-admin/edit-comments.php 2023-04-06 16:42:40 UTC (rev 55630)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = wp_unslash( $_REQUEST['comment_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_ids = $wpdb->get_col(
+ $wpdb->prepare(
+ "SELECT comment_ID FROM $wpdb->comments
+ WHERE comment_approved = %s AND %s > comment_date_gmt",
+ $comment_status,
+ $delete_time
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $doaction = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = $_REQUEST['delete_comments'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +59,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $untrashed = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect_to = remove_query_arg(
+ array(
+ 'trashed',
+ 'untrashed',
+ 'deleted',
+ 'spammed',
+ 'unspammed',
+ 'approved',
+ 'unapproved',
+ 'ids',
+ ),
+ wp_get_referer()
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_defer_comment_counting( true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +305,14 @@
</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">-if ( isset( $_REQUEST['approved'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) || isset( $_REQUEST['spammed'] ) || isset( $_REQUEST['unspammed'] ) || isset( $_REQUEST['same'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['approved'] )
+ || isset( $_REQUEST['deleted'] )
+ || isset( $_REQUEST['trashed'] )
+ || isset( $_REQUEST['untrashed'] )
+ || isset( $_REQUEST['spammed'] )
+ || isset( $_REQUEST['unspammed'] )
+ || isset( $_REQUEST['same'] )
+) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $approved = isset( $_REQUEST['approved'] ) ? (int) $_REQUEST['approved'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = isset( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $trashed = isset( $_REQUEST['trashed'] ) ? (int) $_REQUEST['trashed'] : 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,35 +323,63 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $approved > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $messages[] = sprintf( _n( '%s comment approved.', '%s comments approved.', $approved ), $approved );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s comment approved.', '%s comments approved.', $approved ),
+ $approved
+ );
</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"> if ( $spammed > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $messages[] = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ),
+ $spammed
+ ) . sprintf(
+ ' <a href="%1$s">%2$s</a><br />',
+ esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ),
+ __( 'Undo' )
+ );
</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"> if ( $unspammed > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $messages[] = sprintf( _n( '%s comment restored from the spam.', '%s comments restored from the spam.', $unspammed ), $unspammed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s comment restored from the spam.', '%s comments restored from the spam.', $unspammed ),
+ $unspammed
+ );
</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"> if ( $trashed > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $messages[] = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ),
+ $trashed
+ ) . sprintf(
+ ' <a href="%1$s">%2$s</a><br />',
+ esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ),
+ __( 'Undo' )
+ );
</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"> if ( $untrashed > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $messages[] = sprintf( _n( '%s comment restored from the Trash.', '%s comments restored from the Trash.', $untrashed ), $untrashed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s comment restored from the Trash.', '%s comments restored from the Trash.', $untrashed ),
+ $untrashed
+ );
</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"> if ( $deleted > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Number of comments. */
- $messages[] = sprintf( _n( '%s comment permanently deleted.', '%s comments permanently deleted.', $deleted ), $deleted );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = sprintf(
+ /* translators: %s: Number of comments. */
+ _n( '%s comment permanently deleted.', '%s comments permanently deleted.', $deleted ),
+ $deleted
+ );
</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"> if ( $same > 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,19 +387,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_approved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case '1':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $messages[] = __( 'This comment is already approved.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = __( 'This comment is already approved.' ) . sprintf(
+ ' <a href="%1$s">%2$s</a>',
+ esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ),
+ __( 'Edit comment' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trash':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = __( 'This comment is already in the Trash.' ) . sprintf(
+ ' <a href="%1$s">%2$s</a>',
+ esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ),
+ __( 'View Trash' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'spam':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = __( 'This comment is already marked as spam.' ) . sprintf(
+ ' <a href="%1$s">%2$s</a>',
+ esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ),
+ __( 'Edit comment' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div id="moderated" class="updated notice is-dismissible"><p>' . implode( "<br />\n", $messages ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<div id="moderated" class="updated notice is-dismissible"><p>%s</p></div>',
+ implode( "<br />\n", $messages )
+ );
</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></pre></div>
<a id="trunksrcwpadmineditphp"></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/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2023-04-05 13:10:53 UTC (rev 55629)
+++ trunk/src/wp-admin/edit.php 2023-04-06 16:42:40 UTC (rev 55630)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,8 +442,13 @@
</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"> if ( 'trashed' === $message && isset( $_REQUEST['ids'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
- $messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", 'bulk-posts' ) ) . '">' . __( 'Undo' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
+
+ $messages[] = sprintf(
+ '<a href="%1$s">%2$s</a>',
+ esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", 'bulk-posts' ) ),
+ __( 'Undo' )
+ );
</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"> if ( 'untrashed' === $message && isset( $_REQUEST['ids'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +465,10 @@
</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"> if ( $messages ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div id="message" class="updated notice is-dismissible"><p>' . implode( ' ', $messages ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<div id="message" class="updated notice is-dismissible"><p>%s</p></div>',
+ implode( ' ', $messages )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $messages );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>