Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix Language::parseFormattedNumber for lzh and zh-classical"

Browse source
This commit is contained in:
jenkins-bot 2014-04-25 07:13:29 +00:00 committed by Gerrit Code Review
commit ab2d63b53e
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
languages/Language.php
View file

@ -3130,14 +3130,18 @@ class Language {
* @param string $number
* @return string
*/
function parseFormattedNumber( $number ) {
public function parseFormattedNumber( $number ) {
$s = $this->digitTransformTable();
if ( $s ) {
// eliminate empty array values such as ''. (bug 64347)
$s = array_filter( $s );
$number = strtr( $number, array_flip( $s ) );
}
$s = $this->separatorTransformTable();
if ( $s ) {
// eliminate empty array values such as ''. (bug 64347)
$s = array_filter( $s );
$number = strtr( $number, array_flip( $s ) );
}

23
tests/phpunit/languages/LanguageTest.php
View file

@ -1484,6 +1484,29 @@ class LanguageTest extends LanguageClassesTestCase {
);
}
/**
* @dataProvider parseFormattedNumberProvider
*/
public function testParseFormattedNumber( $langCode, $number ) {
$lang = Language::factory( $langCode );
$localisedNum = $lang->formatNum( $number );
$normalisedNum = $lang->parseFormattedNumber( $localisedNum );
$this->assertEquals( $number, $normalisedNum );
}
public function parseFormattedNumberProvider() {
return array(
array( 'de', 377.01 ),
array( 'fa', 334 ),
array( 'fa', 382.772 ),
array( 'ar', 1844 ),
array( 'lzh', 3731 ),
array( 'zh-classical', 7432 )
);
}
/**
* @covers Language::commafy()
* @dataProvider provideCommafyData