* convertPlural breakage fixed a little

+ non-line beginning tabs and cvs unability to do simple merge for once

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2e838b0..845a0ef 100644 (file)
--- 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 e056fc4..3df742d 100644 (file)
--- 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 3a2be8f..3f40e0b 100644 (file)
--- 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 173e3e3..ab6f953 100644 (file)
--- 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 {