From b5a5e77543f4e6dfa9d3577f229dab4af6b71a75 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Sat, 16 Dec 2006 22:31:08 +0000 Subject: [PATCH] Makes convertPlural compatible (strict standards) --- languages/Language.php | 4 +++- languages/classes/LanguageBe.php | 2 +- languages/classes/LanguageBs.php | 2 +- languages/classes/LanguageCs.php | 2 +- languages/classes/LanguageCu.php | 2 +- languages/classes/LanguageFr.php | 2 +- languages/classes/LanguageHe.php | 6 ++++-- languages/classes/LanguageHr.php | 2 +- languages/classes/LanguageHsb.php | 2 +- languages/classes/LanguageKsh.php | 2 +- languages/classes/LanguageLt.php | 4 ++-- languages/classes/LanguageLv.php | 2 +- languages/classes/LanguagePt_br.php | 2 +- languages/classes/LanguageRu.php | 2 +- languages/classes/LanguageSk.php | 4 ++-- languages/classes/LanguageSr_ec.php | 2 +- languages/classes/LanguageSr_el.php | 2 +- 17 files changed, 24 insertions(+), 20 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 2eaa7ab651..2cd49cdbbf 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1277,9 +1277,11 @@ class Language { * @param string $wordform1 * @param string $wordform2 * @param string $wordform3 (optional) + * @param string $wordform4 (optional) + * @param string $wordform5 (optional) * @return string */ - function convertPlural( $count, $w1, $w2, $w3) { + function convertPlural( $count, $w1, $w2, $w3, $w4, $w5) { return $count == '1' ? $w1 : $w2; } diff --git a/languages/classes/LanguageBe.php b/languages/classes/LanguageBe.php index f2a52cca81..553d2ad371 100644 --- a/languages/classes/LanguageBe.php +++ b/languages/classes/LanguageBe.php @@ -12,7 +12,7 @@ */ class LanguageBe extends Language { - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace ('.', '', $count); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $wordform3; diff --git a/languages/classes/LanguageBs.php b/languages/classes/LanguageBs.php index 4734fdc173..92d000900d 100644 --- a/languages/classes/LanguageBs.php +++ b/languages/classes/LanguageBs.php @@ -7,7 +7,7 @@ class LanguageBs extends Language { - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace ('.', '', $count); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $wordform3; diff --git a/languages/classes/LanguageCs.php b/languages/classes/LanguageCs.php index 6b8d3d61e0..bd2f33a3f7 100644 --- a/languages/classes/LanguageCs.php +++ b/languages/classes/LanguageCs.php @@ -67,7 +67,7 @@ class LanguageCs extends Language { # Plural form transformations, needed for some languages. # Invoked by {{plural:count|wordform1|wordform2|wordform3}} - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace( '\xc2\xa0', '', $count ); switch ( $count ) { case 1: diff --git a/languages/classes/LanguageCu.php b/languages/classes/LanguageCu.php index 6f6efe49e4..f30bd25364 100644 --- a/languages/classes/LanguageCu.php +++ b/languages/classes/LanguageCu.php @@ -36,7 +36,7 @@ class LanguageCu extends Language { return $word; } - function convertPlural( $count, $wordform1, $wordform2, $wordform3, $wordform4) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $wordform4, $w5) { switch ($count % 10) { case 1: return $wordform1; case 2: return $wordform2; diff --git a/languages/classes/LanguageFr.php b/languages/classes/LanguageFr.php index 61cd91c623..b150ceff61 100644 --- a/languages/classes/LanguageFr.php +++ b/languages/classes/LanguageFr.php @@ -10,7 +10,7 @@ class LanguageFr extends Language { /** * Use singular form for zero (see bug 7309) */ - function convertPlural( $count, $w1, $w2, $w3) { + function convertPlural( $count, $w1, $w2, $w3, $w4, $w5) { return $count <= '1' ? $w1 : $w2; } } diff --git a/languages/classes/LanguageHe.php b/languages/classes/LanguageHe.php index 70de3115c2..e84d45d8cd 100644 --- a/languages/classes/LanguageHe.php +++ b/languages/classes/LanguageHe.php @@ -52,11 +52,13 @@ class LanguageHe extends Language { * @param integer the number of items * @param string the first form (singular) * @param string the second form (plural) - * @param string the third form (2 items, plural is used if not applicable and not specified) + * @param string the third form (2 items, plural is used if not applicable and not specified + * @param not used (for compatibility with ancestor) + * @param not used (for compatibility with ancestor) * * @return string of the suited form of word */ - public function convertPlural( $count, $w1, $w2, $w3) { + public function convertPlural( $count, $w1, $w2, $w3, $w4, $w5) { if ( $count == '1' ) { return $w1; } elseif ( $count == '2' && $w3 ) { diff --git a/languages/classes/LanguageHr.php b/languages/classes/LanguageHr.php index b1f6b0fcb5..537c142ddb 100644 --- a/languages/classes/LanguageHr.php +++ b/languages/classes/LanguageHr.php @@ -6,7 +6,7 @@ */ class LanguageHr extends Language { - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace ('.', '', $count); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $wordform3; diff --git a/languages/classes/LanguageHsb.php b/languages/classes/LanguageHsb.php index 3128caa6dd..08163b7294 100644 --- a/languages/classes/LanguageHsb.php +++ b/languages/classes/LanguageHsb.php @@ -101,7 +101,7 @@ class LanguageHsb extends Language { return $word; # this will return the original value for 'nominatiw' (nominativ) and all undefined case values } - function convertPlural( $count, $singular, $dual, $plural, $pluralgen ) { + function convertPlural( $count, $singular, $dual, $plural, $pluralgen, $w5 ) { switch ( abs( $count ) % 100 ) { case 1: return $singular; diff --git a/languages/classes/LanguageKsh.php b/languages/classes/LanguageKsh.php index 412a00f436..7795e0482e 100644 --- a/languages/classes/LanguageKsh.php +++ b/languages/classes/LanguageKsh.php @@ -21,7 +21,7 @@ class LanguageKsh extends Language { /** * Handle cases of (1, other, 0) or (1, other) */ - public function convertPlural( $count, $w1, $w2, $w3 ) { + public function convertPlural( $count, $w1, $w2, $w3, $w4, $w5 ) { $count = str_replace (' ', '', $count); if ( $count == '1' ) { return $w1; diff --git a/languages/classes/LanguageLt.php b/languages/classes/LanguageLt.php index 1770f8e2f4..14031febc3 100644 --- a/languages/classes/LanguageLt.php +++ b/languages/classes/LanguageLt.php @@ -11,8 +11,8 @@ class LanguageLt extends Language { 1 - vienas (1) lapas, dvidešimt vienas (21) lapas 2 - trys (3) lapai 3 - penkiolika (15) lapų - */ - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + */ + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { if ($count%10==1 && $count%100!=11) return $wordform1; if ($count%10>=2 && ($count%100<10 || $count%100>=20)) return $wordform2; //if third form not specified, then use second form diff --git a/languages/classes/LanguageLv.php b/languages/classes/LanguageLv.php index 54cae48717..c45d96e4a6 100644 --- a/languages/classes/LanguageLv.php +++ b/languages/classes/LanguageLv.php @@ -22,7 +22,7 @@ class LanguageLv extends Language { * @param string $wordform3 (not used) * @return string */ - function convertPlural( $count, $wordform1, $wordform2, $wordform3 ) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5 ) { return ( ( $count % 10 == 1 ) && ( $count % 100 != 11 ) ) ? $wordform1 : $wordform2; } diff --git a/languages/classes/LanguagePt_br.php b/languages/classes/LanguagePt_br.php index 6132aaa230..06dc4d9c85 100644 --- a/languages/classes/LanguagePt_br.php +++ b/languages/classes/LanguagePt_br.php @@ -10,7 +10,7 @@ class LanguagePt_br extends Language { /** * Use singular form for zero (see bug 7309) */ - function convertPlural( $count, $w1, $w2, $w3) { + function convertPlural( $count, $w1, $w2, $w3, $w4, $w5) { return $count <= '1' ? $w1 : $w2; } } diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php index b64a4144d6..a251aa529a 100644 --- a/languages/classes/LanguageRu.php +++ b/languages/classes/LanguageRu.php @@ -57,7 +57,7 @@ class LanguageRu extends Language { return $word; } - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace (' ', '', $count); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $wordform3; diff --git a/languages/classes/LanguageSk.php b/languages/classes/LanguageSk.php index 2fa8df0fb7..5b71c6aab1 100644 --- a/languages/classes/LanguageSk.php +++ b/languages/classes/LanguageSk.php @@ -76,8 +76,8 @@ class LanguageSk extends Language { } return $word; } - - function convertPlural( $count, $w1, $w2, $w3) { + + function convertPlural( $count, $w1, $w2, $w3, $w4, $w5) { $count = str_replace ('.', '', $count); $forms = array( $w1, $w2, $w3); if ( $count == 1 ) { diff --git a/languages/classes/LanguageSr_ec.php b/languages/classes/LanguageSr_ec.php index f84ebd0639..72f56b8cc8 100644 --- a/languages/classes/LanguageSr_ec.php +++ b/languages/classes/LanguageSr_ec.php @@ -9,7 +9,7 @@ #-------------------------------------------------------------------------- class LanguageSr_ec extends Language { - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace ('.', '', $count); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $wordform3; diff --git a/languages/classes/LanguageSr_el.php b/languages/classes/LanguageSr_el.php index cba1b57ead..1ecacc0e7e 100644 --- a/languages/classes/LanguageSr_el.php +++ b/languages/classes/LanguageSr_el.php @@ -9,7 +9,7 @@ #-------------------------------------------------------------------------- class LanguageSr_el extends Language { - function convertPlural( $count, $wordform1, $wordform2, $wordform3) { + function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) { $count = str_replace ('.', '', $count); if ($count > 10 && floor(($count % 100) / 10) == 1) { return $wordform3; -- 2.20.1