<!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>[53543] trunk: I18N: Correct and improve inline docs and tests for functionality related to nooped plurals.</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/53543">53543</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/53543","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-06-20 22:55:52 +0000 (Mon, 20 Jun 2022)</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 and improve inline docs and tests for functionality related to nooped plurals.
See <a href="https://core.trac.wordpress.org/ticket/55646">#55646</a>, <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsl10nphp">trunk/tests/phpunit/tests/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescategorytemplatephp"></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/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2022-06-20 22:24:03 UTC (rev 53542)
+++ trunk/src/wp-includes/category-template.php 2022-06-20 22:55:52 UTC (rev 53543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,7 +823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'DESC' (descending), or 'RAND' (random). Default 'ASC'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int|bool $filter Whether to enable filtering of the final output
</span><span class="cx" style="display: block; padding: 0 10px"> * via {@see 'wp_generate_tag_cloud'}. Default 1.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $topic_count_text Nooped plural text from _n_noop() to supply to
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array $topic_count_text Nooped plural text from _n_noop() to supply to
</ins><span class="cx" style="display: block; padding: 0 10px"> * tag counts. Default null.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type callable $topic_count_text_callback Callback used to generate nooped plural text for
</span><span class="cx" style="display: block; padding: 0 10px"> * tag counts based on the count. Default null.
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></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/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2022-06-20 22:24:03 UTC (rev 53542)
+++ trunk/src/wp-includes/l10n.php 2022-06-20 22:55:52 UTC (rev 53543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,12 +587,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of translation information for the strings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $0 Singular form to be localized. No longer used.
- * @type string $1 Plural form to be localized. No longer used.
- * @type string $singular Singular form to be localized.
- * @type string $plural Plural form to be localized.
- * @type null $context Context information for the translators.
- * @type string $domain Text domain.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $0 Singular form to be localized. No longer used.
+ * @type string $1 Plural form to be localized. No longer used.
+ * @type string $singular Singular form to be localized.
+ * @type string $plural Plural form to be localized.
+ * @type null $context Context information for the translators.
+ * @type string|null $domain Text domain.
</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"> function _n_noop( $singular, $plural, $domain = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +654,7 @@
</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">- * Translates and retrieves the singular or plural form of a string that's been registered
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Translates and returns the singular or plural form of a string that's been registered
</ins><span class="cx" style="display: block; padding: 0 10px"> * with _n_noop() or _nx_noop().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Used when you want to use a translatable plural string once the number is known.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -667,11 +667,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.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">- * @param array $nooped_plural Array with singular, plural, and context keys, usually the result of _n_noop() or _nx_noop().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $nooped_plural {
+ * Array that is usually a return value from _n_noop() or _nx_noop().
+ *
+ * @type string $singular Singular form to be localized.
+ * @type string $plural Plural form to be localized.
+ * @type string|null $context Context information for the translators.
+ * @type string|null $domain Text domain.
+ * }
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $count Number of objects.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings. If $nooped_plural contains
</span><span class="cx" style="display: block; padding: 0 10px"> * a text domain passed to _n_noop() or _nx_noop(), it will override this value. Default 'default'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Either $single or $plural translated text.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Either $singular or $plural translated text.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nooped_plural['domain'] ) {
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2022-06-20 22:24:03 UTC (rev 53542)
+++ trunk/src/wp-includes/post.php 2022-06-20 22:55:52 UTC (rev 53543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1254,8 +1254,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool|string $label A descriptive name for the post status marked
</span><span class="cx" style="display: block; padding: 0 10px"> * for translation. Defaults to value of $post_status.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type bool|array $label_count Descriptive text to use for nooped plurals.
- * Default array of $label, twice.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array|false $label_count Nooped plural text from _n_noop() to provide the singular
+ * and plural forms of the label for counts. Default false
+ * which means the `$label` argument will be used for both
+ * the singular and plural forms of this label.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $exclude_from_search Whether to exclude posts with this post status
</span><span class="cx" style="display: block; padding: 0 10px"> * from search results. Default is value of $internal.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $_builtin Whether the status is built-in. Core-use only.
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nphp"></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/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n.php 2022-06-20 22:24:03 UTC (rev 53542)
+++ trunk/tests/phpunit/tests/l10n.php 2022-06-20 22:55:52 UTC (rev 53543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_domain = 'text-domain';
</span><span class="cx" style="display: block; padding: 0 10px"> $nooped_plural = _n_noop( '%s post', '%s posts', $text_domain );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $nooped_plural['domain'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'text-domain', $nooped_plural['domain'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%s posts', translate_nooped_plural( $nooped_plural, 0, $text_domain ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%s post', translate_nooped_plural( $nooped_plural, 1, $text_domain ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%s posts', translate_nooped_plural( $nooped_plural, 2, $text_domain ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_domain = 'text-domain';
</span><span class="cx" style="display: block; padding: 0 10px"> $nooped_plural = _nx_noop( '%s post', '%s posts', 'my-context', $text_domain );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotEmpty( $nooped_plural['domain'] );
- $this->assertNotEmpty( $nooped_plural['context'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'text-domain', $nooped_plural['domain'] );
+ $this->assertSame( 'my-context', $nooped_plural['context'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%s posts', translate_nooped_plural( $nooped_plural, 0, $text_domain ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%s post', translate_nooped_plural( $nooped_plural, 1, $text_domain ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '%s posts', translate_nooped_plural( $nooped_plural, 2, $text_domain ) );
</span></span></pre>
</div>
</div>
</body>
</html>