From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 15 Aug 2008 01:29:47 +0200 Subject: Update auf 1.13.0 --- languages/classes/LanguageBe_tarask.php | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'languages/classes/LanguageBe_tarask.php') diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php index d2dd4825..312735da 100644 --- a/languages/classes/LanguageBe_tarask.php +++ b/languages/classes/LanguageBe_tarask.php @@ -1,7 +1,7 @@ * @bug 1638, 2135 @@ -12,21 +12,20 @@ class LanguageBe_tarask extends Language { /** - * Plural form transformations - * - * $wordform1 - singular form (for 1, 21, 31, 41...) - * $wordform2 - plural form (for 2, 3, 4, 22, 23, 24, 32, 33, 34...) - * $wordform3 - plural form (for 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26...) - * $wordform4 - plural form for messages without number - */ + * Plural form transformations + * + * $wordform1 - singular form (for 1, 21, 31, 41...) + * $wordform2 - plural form (for 2, 3, 4, 22, 23, 24, 32, 33, 34...) + * $wordform3 - plural form (for 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26...) + */ function convertPlural( $count, $forms ) { if ( !count($forms) ) { return ''; } - $forms = $this->preConvertPlural( $forms, 3 ); - $count = abs( $count ); - if ( isset($forms[3]) && $count != 1 ) - return $forms[3]; + //if no number with word, then use $form[0] for singular and $form[1] for plural or zero + if( count($forms) === 2 ) return $count == 1 ? $forms[0] : $forms[1]; + + $forms = $this->preConvertPlural( $forms, 3 ); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $forms[2]; @@ -97,7 +96,4 @@ class LanguageBe_tarask extends Language { return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values } - } - - -- cgit v1.2.2