MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / languages / classes / LanguageFr.php

diff --git a/languages/classes/LanguageFr.php b/languages/classes/LanguageFr.php
index 87d28b2214e7e1380bc2376af822c0db1cceb933..dec1204ca1e905ea111c6c557703e7b073d8b7e8 100644 (file)
--- a/languages/classes/LanguageFr.php
+++ b/languages/classes/LanguageFr.php
@@ -1,16 +1,17 @@
 <?php
+
 /** French (Français)
  *
- * @addtogroup Language
- *
+ * @ingroup Language
  */
-
 class LanguageFr extends Language {
        /**
         * Use singular form for zero (see bug 7309)
         */
-        function convertPlural( $count, $w1, $w2, $w3, $w4, $w5) {
-               return $count <= '1' ? $w1 : $w2;
-        }
-}
+       function convertPlural( $count, $forms ) {
+               if ( !count( $forms ) ) { return ''; }
+               $forms = $this->preConvertPlural( $forms, 2 );
 
+               return ( $count <= 1 ) ? $forms[0] : $forms[1];
+       }
+}