Makes convertPlural compatible (strict standards)

diff --git a/languages/Language.php b/languages/Language.php
index 2eaa7ab..2cd49cd 100644 (file)
--- 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 f2a52cc..553d2ad 100644 (file)
--- 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 4734fdc..92d0009 100644 (file)
--- 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 6b8d3d6..bd2f33a 100644 (file)
--- 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 6f6efe4..f30bd25 100644 (file)
--- 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 61cd91c..b150cef 100644 (file)
--- 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 70de311..e84d45d 100644 (file)
--- 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 b1f6b0f..537c142 100644 (file)
--- 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 3128caa..08163b7 100644 (file)
--- 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 412a00f..7795e04 100644 (file)
--- 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 1770f8e..14031fe 100644 (file)
--- 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 54cae48..c45d96e 100644 (file)
--- 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 6132aaa..06dc4d9 100644 (file)
--- 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 b64a414..a251aa5 100644 (file)
--- 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 2fa8df0..5b71c6a 100644 (file)
--- 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 f84ebd0..72f56b8 100644 (file)
--- 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 cba1b57..1ecacc0 100644 (file)
--- 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;