Update auf MediaWiki 1.12.0

1 files changed, 28 insertions, 6 deletions

diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php
index 7d088053..f6311b33 100644
--- a/languages/classes/LanguageRu.php
+++ b/languages/classes/LanguageRu.php
@@ -56,17 +56,38 @@ class LanguageRu extends Language {
 		return $word;
 	}
 
-	function convertPlural( $count, $wordform1, $wordform2, $wordform3, $w4, $w5) {
-		$count = str_replace (' ', '', $count);
+	/**
+	 * Plural form transformations
+	 *
+	 * $forms[0] - singular form (for 1, 21, 31, 41...)
+	 * $forms[1] - paucal form (for 2, 3, 4, 22, 23, 24, 32, 33, 34...)
+	 * $forms[2] - plural form (for 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26...)
+	 *
+	 * Examples:
+	 *   message with number
+	 *     "Сделано $1 {{PLURAL:$1|изменение|изменения|изменений}}"
+	 *   message without number
+	 *     "Действие не может быть выполнено по {{PLURAL:$1|следующей причине|следующим причинам}}:"
+	 *
+	 */
+
+	function convertPlural( $count, $forms ) {
+		if ( !count($forms) ) { return ''; }
+
+		//if no number with word, then use $form[0] for singular and $form[1] for plural or zero
+		if( count($forms) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
+
+		$forms = $this->preConvertPlural( $forms, 3 );
+
 		if ($count > 10 && floor(($count % 100) / 10) == 1) {
-			return $wordform3;
+			return $forms[2];
 		} else {
 			switch ($count % 10) {
-				case 1: return $wordform1;
+				case 1:  return $forms[0];
 				case 2:
 				case 3:
-				case 4: return $wordform2;
-				default: return $wordform3;
+				case 4:  return $forms[1];
+				default: return $forms[2];
 			}
 		}
 	}
@@ -84,3 +105,4 @@ class LanguageRu extends Language {
 	}
 }
 
+