<!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>[50655] branches/5.7/src: Coding Standards: Move some translator comments to the correct place.</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/50655">50655</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/50655","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>2021-04-04 18:32:47 +0000 (Sun, 04 Apr 2021)</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'>Coding Standards: Move some translator comments to the correct place.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/46273">[46273]</a>, <a href="https://core.trac.wordpress.org/changeset/50060">[50060]</a>, <a href="https://core.trac.wordpress.org/changeset/50117">[50117]</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/50654">[50654]</a> to the 5.7 branch.
See <a href="https://core.trac.wordpress.org/ticket/52627">#52627</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches57srcwpincludesclasswprecoverymodeemailservicephp">branches/5.7/src/wp-includes/class-wp-recovery-mode-email-service.php</a></li>
<li><a href="#branches57srcwpincludesrestapiphp">branches/5.7/src/wp-includes/rest-api.php</a></li>
<li><a href="#branches57srcwploginphp">branches/5.7/src/wp-login.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches57">branches/5.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.7 2021-04-04 18:28:59 UTC (rev 50654)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.7 2021-04-04 18:32:47 UTC (rev 50655)
</ins><a id="branches57"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:50428-50430,50432,50435-50436,50439,50441-50445,50460-50461,50465-50466,50471,50475,50478-50479,50483,50485-50487,50493,50495,50499,50501,50507,50510,50518,50523,50525,50534-50535,50545,50551-50552,50566-50569,50571,50577,50579,50585,50590-50598,50628,50634
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:50428-50430,50432,50435-50436,50439,50441-50445,50460-50461,50465-50466,50471,50475,50478-50479,50483,50485-50487,50493,50495,50499,50501,50507,50510,50518,50523,50525,50534-50535,50545,50551-50552,50566-50569,50571,50577,50579,50585,50590-50598,50628,50634,50654
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches57srcwpincludesclasswprecoverymodeemailservicephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/src/wp-includes/class-wp-recovery-mode-email-service.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/src/wp-includes/class-wp-recovery-mode-email-service.php 2021-04-04 18:28:59 UTC (rev 50654)
+++ branches/5.7/src/wp-includes/class-wp-recovery-mode-email-service.php 2021-04-04 18:32:47 UTC (rev 50655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,8 +331,8 @@
</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"> $debug = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Current WordPress version number. */
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp' => sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Current WordPress version number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'WordPress version %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_version
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="branches57srcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/src/wp-includes/rest-api.php 2021-04-04 18:28:59 UTC (rev 50654)
+++ branches/5.7/src/wp-includes/rest-api.php 2021-04-04 18:32:47 UTC (rev 50655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2284,8 +2284,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['minProperties'] ) && count( $value ) < $args['minProperties'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_too_few_properties',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at least %2$s property.',
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at least %2$s properties.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2300,8 +2300,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['maxProperties'] ) && count( $value ) > $args['maxProperties'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_too_many_properties',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at most %2$s property.',
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at most %2$s properties.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2350,8 +2350,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['minItems'] ) && count( $value ) < $args['minItems'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_too_few_items',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at least %2$s item.',
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at least %2$s items.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2366,8 +2366,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['maxItems'] ) && count( $value ) > $args['maxItems'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_too_many_items',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at most %2$s item.',
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must contain at most %2$s items.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2456,8 +2456,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value >= $args['maximum'] || $value <= $args['minimum'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_out_of_bounds',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s must be between %2$d (exclusive) and %3$d (exclusive)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $param,
</span><span class="cx" style="display: block; padding: 0 10px"> $args['minimum'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2471,8 +2471,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value > $args['maximum'] || $value <= $args['minimum'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_out_of_bounds',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s must be between %2$d (exclusive) and %3$d (inclusive)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $param,
</span><span class="cx" style="display: block; padding: 0 10px"> $args['minimum'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2486,8 +2486,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value >= $args['maximum'] || $value < $args['minimum'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_out_of_bounds',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s must be between %2$d (inclusive) and %3$d (exclusive)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $param,
</span><span class="cx" style="display: block; padding: 0 10px"> $args['minimum'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2501,8 +2501,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value > $args['maximum'] || $value < $args['minimum'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_out_of_bounds',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Minimum number, 3: Maximum number. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s must be between %2$d (inclusive) and %3$d (inclusive)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $param,
</span><span class="cx" style="display: block; padding: 0 10px"> $args['minimum'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2539,8 +2539,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['minLength'] ) && mb_strlen( $value ) < $args['minLength'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_too_short',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Number of characters. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Number of characters. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must be at least %2$s character long.',
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must be at least %2$s characters long.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2555,8 +2555,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['maxLength'] ) && mb_strlen( $value ) > $args['maxLength'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_too_long',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Parameter, 2: Number of characters. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Parameter, 2: Number of characters. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must be at most %2$s character long.',
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s must be at most %2$s characters long.',
</span></span></pre></div>
<a id="branches57srcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.7/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.7/src/wp-login.php 2021-04-04 18:28:59 UTC (rev 50654)
+++ branches/5.7/src/wp-login.php 2021-04-04 18:32:47 UTC (rev 50655)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,8 +287,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html_link = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( home_url( '/' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Site title. */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site title. */
</ins><span class="cx" style="display: block; padding: 0 10px"> _x( '← Go to %s', 'site' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_bloginfo( 'title', 'display' )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre>
</div>
</div>
</body>
</html>