<!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>[37987] trunk: I18N: Introduce an on/off switch for locales where comment number needs to be declined.</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 { 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/37987">37987</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/37987","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>2016-07-06 14:45:55 +0000 (Wed, 06 Jul 2016)</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: Introduce an on/off switch for locales where comment number needs to be declined.
When enabled, the switch would override the theme's pseudo-plural `'% Comments'` string with a correct form of `_n( '%s Comment', '%s Comments', $number )`.
Historically, `comments_popup_link()` and `get_comments_number_text()` did not support plural forms and used a pseudo-plural style instead, so some locales were forced to come up with workarounds to display the number of comments in their language correctly.
This change should make those functions more i18n-friendly.
Fixes <a href="https://core.trac.wordpress.org/ticket/13651">#13651</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunktestsphpunittestscommenttemplatephp">trunk/tests/phpunit/tests/comment/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommenttemplatephp"></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/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2016-07-06 14:04:06 UTC (rev 37986)
+++ trunk/src/wp-includes/comment-template.php 2016-07-06 14:45:55 UTC (rev 37987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,6 +893,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // % Comments
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: If comment number in your language requires declension,
+ * translate this to 'on'. Do not translate into your own language.
+ */
+ if ( 'on' === _x( 'off', 'Comment number declension: on or off' ) ) {
+ $text = preg_replace( '#<span class="screen-reader-text">.+?</span>#', '', $more );
+ $text = preg_replace( '/&.+?;/', '', $text ); // Kill entities
+ $text = trim( strip_tags( $text ), '% ' );
+
+ // Replace '% Comments' with a proper plural form
+ if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
+ /* translators: %s: number of comments */
+ $new_text = _n( '%s Comment', '%s Comments', $number );
+ $new_text = trim( sprintf( $new_text, '' ) );
+
+ $more = str_replace( $text, $new_text, $more );
+ if ( false === strpos( $more, '%' ) ) {
+ $more = '% ' . $more;
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = str_replace( '%', number_format_i18n( $number ), $more );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $number == 0 ) {
</span></span></pre></div>
<a id="trunktestsphpunittestscommenttemplatephp"></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/comment/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/template.php 2016-07-06 14:04:06 UTC (rev 37986)
+++ trunk/tests/phpunit/tests/comment/template.php 2016-07-06 14:45:55 UTC (rev 37987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,4 +30,117 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 12, get_comments_number() );
</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">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 13651
+ */
+ function test_get_comments_number_text_declension_with_default_args() {
+ $post_id = $this->factory->post->create();
+ $permalink = get_permalink( $post_id );
+ $this->go_to( $permalink );
+
+ $this->assertEquals( __( 'No Comments' ), get_comments_number_text() );
+
+ $this->factory->comment->create_post_comments( $post_id, 1 );
+ $this->go_to( $permalink );
+
+ $this->assertEquals( __( '1 Comment' ), get_comments_number_text() );
+
+ $this->factory->comment->create_post_comments( $post_id, 1 );
+ $this->go_to( $permalink );
+
+ $this->assertEquals( sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ), get_comments_number_text() );
+
+ }
+
+ /**
+ * @ticket 13651
+ * @dataProvider data_get_comments_number_text_declension
+ */
+ function test_get_comments_number_text_declension_with_custom_args( $number, $input, $output ) {
+ $post_id = $this->factory->post->create();
+ $permalink = get_permalink( $post_id );
+
+ $this->factory->comment->create_post_comments( $post_id, $number );
+ $this->go_to( $permalink );
+
+ add_filter( 'gettext_with_context', array( $this, '_enable_comment_number_declension' ), 10, 4 );
+
+ $this->assertEquals( $output, get_comments_number_text( false, false, $input ) );
+
+ remove_filter( 'gettext_with_context', array( $this, '_enable_comment_number_declension' ), 10, 4 );
+ }
+
+ function _enable_comment_number_declension( $translation, $text, $context, $domain ) {
+ if ( 'Comment number declension: on or off' === $context ) {
+ $translation = 'on';
+ }
+
+ return $translation;
+ }
+
+ function data_get_comments_number_text_declension() {
+ return array(
+ array(
+ 2,
+ 'Comments (%)',
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ),
+ ),
+ array(
+ 2,
+ '2 Comments',
+ '2 Comments',
+ ),
+ array(
+ 2,
+ '2 Comments<span class="screen-reader-text"> on Hello world!</span>',
+ '2 Comments<span class="screen-reader-text"> on Hello world!</span>',
+ ),
+ array(
+ 2,
+ '2 Comments<span class="screen-reader-text"> on Hello % world!</span>',
+ '2 Comments<span class="screen-reader-text"> on Hello 2 world!</span>' // See #WP37103
+ ),
+ array(
+ 2,
+ __( '% Comments', 'twentyten' ),
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ),
+ ),
+ array(
+ 2,
+ _x( '%', 'comments number', 'twentyeleven' ),
+ '2',
+ ),
+ array(
+ 2,
+ __( '<b>%</b> Replies', 'twentyeleven' ),
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '<b>2</b>' ),
+ ),
+ array(
+ 2,
+ __( '% <span class="reply">comments →</span>', 'twentyeleven' ),
+ sprintf( '2 <span class="reply">%s →</span>', trim( sprintf( _n( '%s Comment', '%s Comments', 2 ), '' ) ) ),
+ ),
+ array(
+ 2,
+ __( '% Replies', 'twentytwelve' ),
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ),
+ ),
+ array(
+ 2,
+ __( 'View all % comments', 'twentythirteen' ),
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ),
+ ),
+ array(
+ 2,
+ __( '% Comments', 'twentyfourteen' ),
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ),
+ ),
+ array(
+ 2,
+ __( '% Comments', 'twentyfifteen' ),
+ sprintf( _n( '%s Comment', '%s Comments', 2 ), '2' ),
+ ),
+ );
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>