(bug 7309) Plurals: use singular form for zero in French and Brazilian

Portuguese

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 144ef9a..19723ed 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -205,6 +205,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Set Vary: Cookie on action=raw generated CSS and JS, to ensure that user
   preferences don't get stuck in proxy caches for other people
 * (bug 7324) Fix error message for failure of Database::sourceFile()
+* (bug 7309) Plurals: use singular form for zero in French and Brazilian Portuguese
 
 
 == Languages updated ==

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
new file mode 100644 (file)
index 0000000..61cd91c
--- /dev/null
+++ b/languages/LanguageFr.php
@@ -0,0 +1,17 @@
+<?php
+/** French (Français)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ *
+ */
+
+class LanguageFr extends Language {
+       /**
+        * Use singular form for zero (see bug 7309)
+        */
+        function convertPlural( $count, $w1, $w2, $w3) {
+               return $count <= '1' ? $w1 : $w2;
+        }
+}
+?>

diff --git a/languages/LanguagePt_br.php b/languages/LanguagePt_br.php
new file mode 100644 (file)
index 0000000..6132aaa
--- /dev/null
+++ b/languages/LanguagePt_br.php
@@ -0,0 +1,17 @@
+<?php
+/** Brazilian Portugese (Portuguêsi do Brasil)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ *
+ */
+
+class LanguagePt_br extends Language {
+       /**
+        * Use singular form for zero (see bug 7309)
+        */
+        function convertPlural( $count, $w1, $w2, $w3) {
+               return $count <= '1' ? $w1 : $w2;
+        }
+}
+?>