Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/52027
Change subject: Remove custom Latvian(lv) language plural rules ...................................................................... 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 --- D languages/classes/LanguageLv.php M tests/phpunit/languages/LanguageLvTest.php 2 files changed, 2 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/27/52027/1 diff --git a/languages/classes/LanguageLv.php b/languages/classes/LanguageLv.php deleted file mode 100644 index e76f6f9..0000000 --- a/languages/classes/LanguageLv.php +++ /dev/null @@ -1,51 +0,0 @@ -<?php -/** - * Latvian (Latviešu) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @author Niklas Laxström - * @copyright Copyright © 2006, Niklas Laxström - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - * @ingroup Language - */ - -/** - * Latvian (Latviešu) - * - * @ingroup Language - */ -class LanguageLv extends Language { - /** - * Plural form transformations. Using the first form for words with the last digit 1, but not for words with the last digits 11, and the second form for all the others. - * - * Example: {{plural:{{NUMBEROFARTICLES}}|article|articles}} - * - * @param $count Integer - * @param $forms Array - * @return String - */ - function convertPlural( $count, $forms ) { - if ( !count( $forms ) ) { return ''; } - - // @todo FIXME: CLDR defines 3 plural forms instead of 2. Form for 0 is missing. - // http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#lv - $forms = $this->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 efb6de6..bd0c759 100644 --- a/tests/phpunit/languages/LanguageLvTest.php +++ b/tests/phpunit/languages/LanguageLvTest.php @@ -10,13 +10,13 @@ /** @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 ), -- To view, visit https://gerrit.wikimedia.org/r/52027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I399f99ddd40eea67e981d5710658ba635f115a31 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Santhosh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
