sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix curly quotes around numbers when applicable. 

Adds unit tests.

Props filosofo, mrmist, aliso, MikeHansenMe, miqrogroove.
Fixes #8775.


git-svn-id: https://develop.svn.wordpress.org/trunk@28721 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-06-10 02:42:35 +00:00
parent ce59109919
commit 013f3f14e3
2 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/formatting.php
View File

@ -88,6 +88,14 @@ function wptexturize($text) {
// Pattern-based replacements of characters.
$dynamic = array();
// Quoted Numbers like "42" or '42.00'
if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
$dynamic[ '/(?<=\A|' . $spaces . ')"(\d[\d\.\,]*)"/' ] = $opening_quote . '$1' . $closing_quote;
}
if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
$dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[\d\.\,]*)\'/' ] = $opening_single_quote . '$1' . $closing_single_quote;
}
// '99 '99s '99's (apostrophe)
if ( "'" !== $apos ) {
$dynamic[ '/\'(?=\d)/' ] = $apos;

68
tests/phpunit/tests/formatting/WPTexturize.php
View File

@ -154,8 +154,8 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
function test_wptexturize_quotes_around_numbers() {
$this->assertEquals('&#8220;12345&#8221;', wptexturize('"12345"'));
$this->assertEquals('&#8216;12345&#8217;', wptexturize('\'12345\''));
$this->assertEquals('&#8220;a 9&#8242; plus a &#8216;9&#8217;, maybe a 9&#8242; &#8216;9&#8217; &#8221;', wptexturize('"a 9\' plus a \'9\', maybe a 9\' \'9\' "'));
$this->assertEquals('<p>&#8216;99<br />&#8216;123&#8217;<br />&#8217;tis<br />&#8216;s&#8217;</p>', wptexturize('<p>\'99<br />\'123\'<br />\'tis<br />\'s\'</p>'));
$this->assertEquals('&#8220;a 9&#8242; plus a &#8216;9&#8217;, maybe a 9&#8242; &#8216;9&#8217;&#8221;', wptexturize('"a 9\' plus a \'9\', maybe a 9\' \'9\'"'));
$this->assertEquals('<p>&#8217;99<br />&#8216;123&#8217;<br />&#8217;tis<br />&#8216;s&#8217;</p>', wptexturize('<p>\'99<br />\'123\'<br />\'tis<br />\'s\'</p>'));
}
/**
@ -312,22 +312,10 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
"word '99&#8217;s word", // Appears as a separate but logically superfluous pattern in 3.8.
"word &#8217;99&#8217;s word",
),
array(
"word '99's word", // Due to the logic error, second apos becomes a prime. See ticket #22823
"word &#8217;99&#8242;s word",
),
array(
"word '99'samsonite",
"word &#8217;99&#8242;samsonite",
),
array(
"according to our source, '33% of all students scored less than 50' on the test.", // Apostrophes and primes have priority over quotes
"according to our source, &#8217;33% of all students scored less than 50&#8242; on the test.",
),
array(
"word '99' word", // See ticket #8775
"word &#8217;99&#8242; word",
),
);
}
@ -1026,4 +1014,56 @@ class Tests_Formatting_WPTexturize extends WP_UnitTestCase {
),
);
}
/**
* Numbers inside of matching quotes get curly quotes instead of apostrophes and primes.
*
* @ticket 8775
* @dataProvider data_quoted_numbers
*/
function test_quoted_numbers( $input, $output ) {
return $this->assertEquals( $output, wptexturize( $input ) );
}
function data_quoted_numbers() {
return array(
array(
'word "42.00" word',
'word &#8220;42.00&#8221; word',
),
array(
'word "42.00"word',
'word &#8220;42.00&#8221;word',
),
array(
"word '42.00' word",
"word &#8216;42.00&#8217; word",
),
array(
"word '42.00'word",
"word &#8216;42.00&#8217;word",
),
array(
'word "42" word',
'word &#8220;42&#8221; word',
),
array(
'word "42,00" word',
'word &#8220;42,00&#8221; word',
),
array(
'word "4,242.00" word',
'word &#8220;4,242.00&#8221; word',
),
array(
"word '99's word", // Is this correct?
"word &#8216;99&#8217;s word",
),
array(
"word '99'samsonite",
"word &#8216;99&#8217;samsonite",
),
);
}
}