From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 3 Jan 2006 15:53:44 +0000 (+0000)
Subject: More in series of convertPlural
X-Git-Tag: 1.6.0~786
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=d28b82ecd8bb3a393de419abc791d51765d44ad0;p=lhc%2Fweb%2Fwiklou.git

More in series of convertPlural
+polished the insane space+tab indentation in Ru
---

diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php
index da915ecdff..09570a5e83 100644
--- a/languages/LanguageBe.php
+++ b/languages/LanguageBe.php
@@ -589,6 +589,7 @@ class LanguageBe extends LanguageUtf8 {
 	}
 
 	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
+		$count = str_replace ('.', '', $count);
 		if ($count > 10 && floor(($count % 100) / 10) == 1) {
 			return $wordform3;
 		} else {
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 68f99c0b6a..aa3715d84e 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -2003,21 +2003,19 @@ class LanguageRu extends LanguageUtf8 {
 	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
 		if ($count > 10 && floor(($count % 100) / 10) == 1) {
 			return $wordform3;
-		}
-		else {
-        		switch ($count % 10) {
-                		case 1: return $wordform1;
-                		case 2: return $wordform2;
-                		case 3: return $wordform2;
-                		case 4: return $wordform2;
+		} else {
+			switch ($count % 10) {
+				case 1: return $wordform1;
+				case 2: return $wordform2;
+				case 3: return $wordform2;
+				case 4: return $wordform2;
 				default: return $wordform3;
-        		}
+			}
 		}
 	}
 
-	function formatNum( $number ) {
-		global $wgTranslateNumerals;
-		return $wgTranslateNumerals ? strtr($number, '.,', ', ' ) : $number;
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($number, '.,', ', ' );
 	}
 
 }