<!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>[GlotPress][1031] trunk: Prevent warnings on original with plural when the singular and plural might have different placeholders.</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://glotpress.trac.wordpress.org/changeset/1031">1031</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/1031","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>yoavf</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-30 10:04:00 +0000 (Thu, 30 Apr 2015)</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'>Prevent warnings on original with plural when the singular and plural might have different placeholders. Props akirk.
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/436">#436</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludeswarningsphp">trunk/gp-includes/warnings.php</a></li>
<li><a href="#trunktteststest_builtin_warningsphp">trunk/t/tests/test_builtin_warnings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludeswarningsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/warnings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/warnings.php 2015-04-30 09:17:26 UTC (rev 1030)
+++ trunk/gp-includes/warnings.php 2015-04-30 10:04:00 UTC (rev 1031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,15 +25,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $skip = array( 'singular' => false, 'plural' => false );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_null( $plural ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $numbers_for_index = $locale->numbers_for_index( $translation_index );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $numbers_for_index == array(1) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $locale->nplurals == 1 ) {
+ $skip['singular'] = true;
+ } else if ( in_array( 1, $numbers_for_index ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $skip['plural'] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- if ( !in_array( 1, $numbers_for_index ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $skip['singular'] = true;
</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 ( $locale->nplurals == 1 ) {
- $skip['singular'] = true;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $this->callbacks as $callback_id => $callback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$skip['singular']) {
</span></span></pre></div>
<a id="trunktteststest_builtin_warningsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/tests/test_builtin_warnings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/test_builtin_warnings.php 2015-04-30 09:17:26 UTC (rev 1030)
+++ trunk/t/tests/test_builtin_warnings.php 2015-04-30 10:04:00 UTC (rev 1031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,4 +79,59 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertHasWarnings( 'both_begin_end_on_newlines', "baba", "\nbaba" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNoWarnings( 'both_begin_end_on_newlines', "\nbaba", "\nbaba" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ function test_placeholders_using_check() {
+ $w = new GP_Translation_Warnings;
+ $builtin = new GP_Builtin_Translation_Warnings;
+ $w->add( 'placeholder', array( $builtin, 'warning_placeholders' ) );
+
+ $fr = new GP_Locale( array(
+ 'nplurals' => 2,
+ 'plural_expression' => 'n > 1'
+ ));
+ $this->assertEquals( null,
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation %1$s', 'translation %2$s' ), $fr ) );
+ $this->assertEquals( null,
+ $w->check( 'original', 'original %s', array( 'translation', 'translation %s' ), $fr ) );
+ $this->assertEquals( array( 1 => array( 'placeholder' => 'Missing %2$s placeholder in translation.' ) ),
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation %1$s', 'translation' ), $fr ) );
+
+ $de = new GP_Locale( array(
+ 'nplurals' => 2,
+ 'plural_expression' => 'n != 1'
+ ));
+ $this->assertEquals( null,
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation %1$s', 'translation %2$s' ), $de ) );
+ $this->assertEquals( null,
+ $w->check( 'original', 'original %s', array( 'translation', 'translation %s' ), $de ) );
+
+ $ja = new GP_Locale( array(
+ 'nplurals' => 1,
+ 'plural_expression' => '0'
+ ));
+
+ $this->assertEquals( null,
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation %2$s' ), $ja ) );
+ $this->assertEquals( null,
+ $w->check( 'original', 'original %s', array( 'translation %s' ), $ja ) );
+ $this->assertEquals( array( 0 => array( 'placeholder' => 'Missing %2$s placeholder in translation.' ) ),
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation' ), $ja ) );
+
+ $ru = new GP_Locale( array(
+ 'nplurals' => 3,
+ 'plural_expression' => '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'
+ ));
+
+ $this->assertEquals( null,
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation %1$s', 'translation %2$s', 'translation 2 %2$s' ), $ru ) );
+ $this->assertEquals( null,
+ $w->check( 'original', 'original %s', array( 'translation', 'translation 2 %s', 'translation 3 %s' ), $ru ) );
+ $this->assertEquals( array( 1 => array( 'placeholder' => 'Missing %2$s placeholder in translation.' ) ),
+ $w->check( 'original %1$s', 'original %2$s', array( 'translation %1$s', 'translation 2', 'translation 3 %2$s' ), $ru ) );
+ $this->assertEquals( array( 2 => array( 'placeholder' => 'Missing %s placeholder in translation.' ) ),
+ $w->check( 'original', 'original %s', array( 'translation', 'translation 2 %s', 'translation 3' ), $ru ) );
+ $this->assertEquals( array( 1 => array( 'placeholder' => 'Missing %s placeholder in translation.' ),
+ 2 => array( 'placeholder' => 'Missing %s placeholder in translation.' ) ),
+ $w->check( 'original', 'original %s', array( 'translation', 'translation 2', 'translation 3' ), $ru ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>