Merge "Added result properties to action=paraminfo"

[lhc/web/wiklou.git] / languages / classes / LanguageFr.php

diff --git a/languages/classes/LanguageFr.php b/languages/classes/LanguageFr.php
index b150cef..edbe1fb 100644 (file)
--- a/languages/classes/LanguageFr.php
+++ b/languages/classes/LanguageFr.php
@@ -1,17 +1,44 @@
 <?php
-/** French (Français)
+/**
+ * French (Français) specific code.
  *
- * @package MediaWiki
- * @subpackage Language
+ * 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
+ * @ingroup Language
  */
 
+/**
+ * French (Français)
+ *
+ * @ingroup Language
+ */
 class LanguageFr extends Language {
        /**
         * Use singular form for zero (see bug 7309)
+        *
+        * @param $count int
+        * @param $forms array
+        *
+        * @return string
         */
-        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];
+       }
 }
-?>