<!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>[28762] trunk: Add Unit Tests for i18n and `wptexturize()`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28762">28762</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-17 17:56:08 +0000 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Unit Tests for i18n and `wptexturize()`. Don't confuse closing single quotes and apostrophes.
See <a href="http://core.trac.wordpress.org/ticket/27426">#27426</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (28761 => 28762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-06-17 17:40:07 UTC (rev 28761)
+++ trunk/src/wp-includes/formatting.php 2014-06-17 17:56:08 UTC (rev 28762)
</span><span class="lines">@@ -24,19 +24,21 @@
</span><span class="cx"> * @uses $wp_cockneyreplace Array of formatted entities for certain common phrases
</span><span class="cx"> *
</span><span class="cx"> * @param string $text The text to be formatted
</span><ins>+ * @param bool $reset Set to true for unit testing. Translated patterns will reset.
</ins><span class="cx"> * @return string The string replaced with html entities
</span><span class="cx"> */
</span><del>-function wptexturize($text) {
</del><ins>+function wptexturize($text, $reset = false) {
</ins><span class="cx"> global $wp_cockneyreplace;
</span><span class="cx"> static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
</span><span class="cx"> $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
</span><span class="cx">
</span><del>- if ( false === $run_texturize ) {
</del><ins>+ // If there's nothing to do, just stop.
+ if ( empty( $text ) || false === $run_texturize ) {
</ins><span class="cx"> return $text;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // No need to set up these static variables more than once
- if ( ! isset( $static_characters ) ) {
</del><ins>+ // Set up static variables. Run once only.
+ if ( $reset || ! isset( $static_characters ) ) {
</ins><span class="cx"> /**
</span><span class="cx"> * Filter whether to skip running `wptexturize()`.
</span><span class="cx"> *
</span><span class="lines">@@ -123,9 +125,9 @@
</span><span class="cx"> $dynamic[ '/(?<=\A|[([{<"\-]|' . $spaces . ')\'/' ] = $opening_single_quote;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Apostrophe in a word. No spaces or double apostrophes.
</del><ins>+ // Apostrophe in a word. No spaces, double apostrophes, or other punctuation.
</ins><span class="cx"> if ( "'" != $apos ) {
</span><del>- $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|\'|' . $spaces . ')/' ] = $apos;
</del><ins>+ $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}<>[\]\-]|' . $spaces . ')/' ] = $apos;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 9" (double prime)
</span><span class="lines">@@ -148,9 +150,9 @@
</span><span class="cx"> $dynamic[ '/"/' ] = $closing_quote;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Single quotes followed by spaces or a period.
- if ( "'" !== $closing_single_quote ) {
- $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote;
</del><ins>+ // Single quotes followed by spaces or ending punctuation.
+ if ( "'" != $closing_single_quote ) {
+ $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Dashes and spaces
</span><span class="lines">@@ -163,11 +165,6 @@
</span><span class="cx"> $dynamic_replacements = array_values( $dynamic );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If there's nothing to do, just stop.
- if ( empty( $text ) ) {
- return $text;
- }
-
</del><span class="cx"> // Transform into regexp sub-expression used in _wptexturize_pushpop_element
</span><span class="cx"> // Must do this every time in case plugins use these filters in a context sensitive manner
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php (28761 => 28762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-17 17:40:07 UTC (rev 28761)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php 2014-06-17 17:56:08 UTC (rev 28762)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> function test_spaces_around_hyphens() {
</span><span class="cx"> $nbsp = "\xC2\xA0";
</span><span class="cx">
</span><del>- $this->assertEquals( ' – ', wptexturize( ' - ' ) );
</del><ins>+ $this->assertEquals( ' – ', wptexturize( ' - ' ) );
</ins><span class="cx"> $this->assertEquals( ' – ', wptexturize( ' - ' ) );
</span><span class="cx"> $this->assertEquals( ' – ', wptexturize( ' - ' ) );
</span><span class="cx"> $this->assertEquals( ' – ', wptexturize( ' - ') );
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> $this->assertEquals( " –$nbsp", wptexturize( " -$nbsp" ) );
</span><span class="cx"> $this->assertEquals( "$nbsp– ", wptexturize( "$nbsp- ") );
</span><span class="cx">
</span><del>- $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
</del><ins>+ $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
</ins><span class="cx"> $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
</span><span class="cx"> $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
</span><span class="cx"> $this->assertEquals( ' — ', wptexturize( ' -- ') );
</span><span class="lines">@@ -724,6 +724,10 @@
</span><span class="cx"> "word word’.word",
</span><span class="cx"> ),
</span><span class="cx"> array(
</span><ins>+ "word word', she said",
+ "word word’, she said",
+ ),
+ array(
</ins><span class="cx"> "word word'",
</span><span class="cx"> "word word’",
</span><span class="cx"> ),
</span><span class="lines">@@ -1362,4 +1366,223 @@
</span><span class="cx"> ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Make sure translation actually works.
+ *
+ * Also make sure apostrophes and closing quotes aren't being confused by default.
+ *
+ * @ticket 27426
+ * @dataProvider data_tag_avoidance
+ */
+ function test_translate( $input, $output ) {
+ add_filter( 'gettext_with_context', array( $this, 'filter_translate' ), 10, 4 );
+
+ $result = wptexturize( $input, true );
+
+ remove_filter( 'gettext_with_context', array( $this, 'filter_translate' ), 10, 4 );
+ wptexturize( 'reset', true );
+
+ return $this->assertEquals( $output, $result );
+ }
+
+ function filter_translate( $translations, $text, $context, $domain ) {
+ switch ($text) {
+ case '–' : return '!endash!';
+ case '—' : return '!emdash!';
+ case '‘' : return '!openq1!';
+ case '’' :
+ if ( 'apostrophe' == $context ) {
+ return '!apos!';
+ } else {
+ return '!closeq1!';
+ }
+ case '“' : return '!openq2!';
+ case '”' : return '!closeq2!';
+ case '′' : return '!prime1!';
+ case '″' : return '!prime2!';
+ default : return $translations;
+ }
+ }
+
+ function data_translate() {
+ return array(
+ array(
+ "word '99 word",
+ "word !apos!99 word",
+ ),
+ array(
+ "word'99 word",
+ "word!apos!99 word",
+ ),
+ array(
+ "word 'test sentence' word",
+ "word !openq1!test sentence!closeq1! word",
+ ),
+ array(
+ "'test sentence'",
+ "!openq1!test sentence!closeq1!",
+ ),
+ array(
+ 'word "test sentence" word',
+ 'word !openq2!test sentence!closeq2! word',
+ ),
+ array(
+ '"test sentence"',
+ '!openq2!test sentence!closeq2!',
+ ),
+ array(
+ "word 'word word",
+ "word !openq1!word word",
+ ),
+ array(
+ "word ('word word",
+ "word (!openq1!word word",
+ ),
+ array(
+ "word ['word word",
+ "word [!openq1!word word",
+ ),
+ array(
+ 'word 99" word',
+ 'word 99!prime2! word',
+ ),
+ array(
+ 'word 99"word',
+ 'word 99!prime2!word',
+ ),
+ array(
+ 'word99" word',
+ 'word99!prime2! word',
+ ),
+ array(
+ 'word99"word',
+ 'word99!prime2!word',
+ ),
+ array(
+ "word 99' word",
+ "word 99!prime1! word",
+ ),
+ array(
+ "word99' word",
+ "word99!prime1! word",
+ ),
+ array(
+ "word word's word",
+ "word word!apos!s word",
+ ),
+ array(
+ "word word'. word",
+ "word word!closeq1!. word",
+ ),
+ array(
+ "word ]'. word",
+ "word ]!closeq1!. word",
+ ),
+ array(
+ 'word "word word',
+ 'word !openq2!word word',
+ ),
+ array(
+ 'word ("word word',
+ 'word (!openq2!word word',
+ ),
+ array(
+ 'word ["word word',
+ 'word [!openq2!word word',
+ ),
+ array(
+ 'word word" word',
+ 'word word!closeq2! word',
+ ),
+ array(
+ 'word word") word',
+ 'word word!closeq2!) word',
+ ),
+ array(
+ 'word word"] word',
+ 'word word!closeq2!] word',
+ ),
+ array(
+ 'word word"',
+ 'word word!closeq2!',
+ ),
+ array(
+ 'word word"word',
+ 'word word!closeq2!word',
+ ),
+ array(
+ 'test sentence".',
+ 'test sentence!closeq2!.',
+ ),
+ array(
+ 'test sentence."',
+ 'test sentence.!closeq2!',
+ ),
+ array(
+ 'test sentence." word',
+ 'test sentence.!closeq2! word',
+ ),
+ array(
+ "word word' word",
+ "word word!closeq1! word",
+ ),
+ array(
+ "word word'. word",
+ "word word!closeq1!. word",
+ ),
+ array(
+ "word word'.word",
+ "word word!closeq1!.word",
+ ),
+ array(
+ "word word'",
+ "word word!closeq1!",
+ ),
+ array(
+ "test sentence'.",
+ "test sentence!closeq1!.",
+ ),
+ array(
+ "test sentence.'",
+ "test sentence.!closeq1!",
+ ),
+ array(
+ "test sentence'. word",
+ "test sentence!closeq1!. word",
+ ),
+ array(
+ "test sentence.' word",
+ "test sentence.!closeq1! word",
+ ),
+ array(
+ "word 'tain't word",
+ "word !apos!tain!apos!t word",
+ ),
+ array(
+ "word 'twere word",
+ "word !apos!twere word",
+ ),
+ array(
+ 'word "42.00" word',
+ 'word !openq2!42.00!closeq2! word',
+ ),
+ array(
+ "word '42.00' word",
+ "word !openq1!42.00!closeq1! word",
+ ),
+ array(
+ "word word'. word",
+ "word word!closeq1!. word",
+ ),
+ array(
+ "word word'.word",
+ "word word!closeq1!.word",
+ ),
+ array(
+ "word word', she said",
+ "word word!closeq1!, she said",
+ ),
+ );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>