Changeset 28762

Timestamp:

06/17/2014 05:56:08 PM (10 years ago)

Author:

wonderboymusic

Message:

Add Unit Tests for i18n and wptexturize(). Don't confuse closing single quotes and apostrophes.

See #27426.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (4 diffs)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (4 diffs)

trunk/src/wp-includes/formatting.php

@@ -25 +25 @@
  *
  * @param string $text The text to be formatted
+ * @param bool $reset Set to true for unit testing. Translated patterns will reset.
  * @return string The string replaced with html entities
  */
-function wptexturize($text) {
+function wptexturize($text, $reset = false) {
     global $wp_cockneyreplace;
     static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
         $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
 
-    if ( false === $run_texturize ) {
+    // If there's nothing to do, just stop.
+    if ( empty( $text ) || false === $run_texturize ) {
         return $text;
     }
 
-    // No need to set up these static variables more than once
-    if ( ! isset( $static_characters ) ) {
+    // Set up static variables. Run once only.
+    if ( $reset || ! isset( $static_characters ) ) {
         /**
          * Filter whether to skip running `wptexturize()`.
@@ -124 +126 @@
         }
 
-        // Apostrophe in a word.  No spaces or double apostrophes.
+        // Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
         if ( "'" != $apos ) {
-            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|\'|' . $spaces . ')/' ] = $apos;
+            $dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;"\'(){}<>[\]\-]|' . $spaces . ')/' ] = $apos;
         }
 
@@ -149 +151 @@
         }
 
-        // Single quotes followed by spaces or a period.
-        if ( "'" !== $closing_single_quote ) {
-            $dynamic[ '/\'(?=\Z|\.|' . $spaces . ')/' ] = $closing_single_quote;
+        // Single quotes followed by spaces or ending punctuation.
+        if ( "'" != $closing_single_quote ) {
+            $dynamic[ '/\'(?=\Z|[.,)}>\-\]]|' . $spaces . ')/' ] = $closing_single_quote; 
         }
 
@@ -162 +164 @@
         $dynamic_characters = array_keys( $dynamic );
         $dynamic_replacements = array_values( $dynamic );
-    }
-
-    // If there's nothing to do, just stop.
-    if ( empty( $text ) ) {
-        return $text;
     }
 

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -190 +190 @@
         $nbsp = "\xC2\xA0";
 
-        $this->assertEquals( ' – ', wptexturize( ' - ' ) ); 
+        $this->assertEquals( ' – ', wptexturize( ' - ' ) );
         $this->assertEquals( ' – ', wptexturize( ' - ' ) );
         $this->assertEquals( ' – ', wptexturize( ' - ' ) );
@@ -198 +198 @@
         $this->assertEquals( "$nbsp– ", wptexturize( "$nbsp- ") );
 
-        $this->assertEquals( ' — ', wptexturize( ' -- ' ) ); 
+        $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
         $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
         $this->assertEquals( ' — ', wptexturize( ' -- ' ) );
@@ -725 +725 @@
             ),
             array(
+                "word word', she said",
+                "word word’, she said",
+            ),
+            array(
                 "word word'",
                 "word word’",
@@ -1363 +1367 @@
         );
     }
+
+    /**
+     * 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",
+            ),
+        );
+    }
 }