From d28b82ecd8bb3a393de419abc791d51765d44ad0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Tue, 3 Jan 2006 15:53:44 +0000 Subject: [PATCH] More in series of convertPlural +polished the insane space+tab indentation in Ru --- languages/LanguageBe.php | 1 + languages/LanguageRu.php | 20 +++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) 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, '.,', ', ' ); } } -- 2.20.1