From c89b81e0ba4d5594b8fb4321ef0996f0f8e79f98 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 3 Jan 2006 13:19:44 +0000
Subject: [PATCH] * convertPlural breakage fixed a little + non-line beginning
 tabs and cvs unability to do simple merge for once

---
 RELEASE-NOTES            | 1 +
 languages/Language.php   | 4 ++--
 languages/LanguageHr.php | 2 +-
 languages/LanguageSr.php | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2e838b0428..845a0ef7e8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -397,6 +397,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Default interface text for "selflinks" tweaked
 * Removed broken wgAllowAnonymousMinor and added new group right minoredit
 * (bug 4457) Update for Portuguese language (pt)
+* convertPlural breakage fixed a little
 
 
 === Caveats ===
diff --git a/languages/Language.php b/languages/Language.php
index e056fc4889..3df742df4a 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1418,7 +1418,7 @@ See [[Special:Log/delete]] for a record of recent deletions and restorations.",
 # Contributions
 #
 'contributions' => 'User contributions',
-'userfiles'		=> 'User files',
+'userfiles'     => 'User files',
 'mycontris'     => 'My contributions',
 'contribsub'    => "For $1",
 'nocontribs'    => 'No changes were found matching these criteria.',
@@ -2886,7 +2886,7 @@ class Language {
 	 * @return string
 	 */
 	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
-		return $count == 1 ? $wordform1 : $wordform2;
+		return $count == '1' ? $wordform1 : $wordform2;
 	}
 
 	/**
diff --git a/languages/LanguageHr.php b/languages/LanguageHr.php
index 3a2be8f539..3f40e0bf77 100644
--- a/languages/LanguageHr.php
+++ b/languages/LanguageHr.php
@@ -1866,7 +1866,7 @@ class LanguageHr extends LanguageUtf8 {
  	}
 
 	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
-		$count = strtr( $count, '.', '' );
+		$count = str_replace ('.', '', $count);
 		if ($count > 10 && floor(($count % 100) / 10) == 1) {
 			return $wordform3;
 		} else {
diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 173e3e370a..ab6f953054 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -1793,7 +1793,7 @@ class LanguageSr extends LanguageUtf8 {
 	}
 
 	function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
-		$count = strtr( $count, '.', '' );
+		$count = str_replace ('.', '', $count);
 		if ($count > 10 && floor(($count % 100) / 10) == 1) {
 			return $wordform3;
 		} else {
-- 
2.20.1