From: Santhosh Thottingal Date: Mon, 4 Mar 2013 11:19:02 +0000 (+0530) Subject: Remove custom Latvian(lv) language plural rules X-Git-Tag: 1.31.0-rc.0~20502 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=406d9587959d8e5215856c2f0e56401cd4bd94fe;p=lhc%2Fweb%2Fwiklou.git Remove custom Latvian(lv) language plural rules CLDR is now in sync with MW plural rules. So no need of custom plural logic Change-Id: I399f99ddd40eea67e981d5710658ba635f115a31 --- diff --git a/languages/classes/LanguageLv.php b/languages/classes/LanguageLv.php deleted file mode 100644 index e76f6f9374..0000000000 --- a/languages/classes/LanguageLv.php +++ /dev/null @@ -1,51 +0,0 @@ -preConvertPlural( $forms, 2 ); - - return ( ( $count % 10 == 1 ) && ( $count % 100 != 11 ) ) ? $forms[0] : $forms[1]; - } -} diff --git a/tests/phpunit/languages/LanguageLvTest.php b/tests/phpunit/languages/LanguageLvTest.php index efb6de6e86..bd0c759b09 100644 --- a/tests/phpunit/languages/LanguageLvTest.php +++ b/tests/phpunit/languages/LanguageLvTest.php @@ -10,13 +10,13 @@ class LanguageLvTest extends LanguageClassesTestCase { /** @dataProvider providerPlural */ function testPlural( $result, $value ) { - $forms = array( 'one', 'other' ); + $forms = array( 'zero', 'one', 'other' ); $this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) ); } function providerPlural() { return array( - array( 'other', 0 ), #this must be zero form as per CLDR + array( 'zero', 0 ), array( 'one', 1 ), array( 'other', 11 ), array( 'one', 21 ),