Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 18 insertions, 5 deletions

diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php
index 8f027048..e16761ad 100644
--- a/languages/classes/LanguageRu.php
+++ b/languages/classes/LanguageRu.php
@@ -7,8 +7,15 @@
   * @ingroup Language
   */
 class LanguageRu extends Language {
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{grammar:case|word}}
+
+	/**
+	 * Convert from the nominative form of a noun to some other case
+	 * Invoked with {{grammar:case|word}}
+	 *
+	 * @param $word string
+	 * @param $case string
+	 * @return string
+	 */
 	function convertGrammar( $word, $case ) {
 		global $wgGrammarForms;
 		if ( isset( $wgGrammarForms['ru'][$case][$word] ) ) {
@@ -67,16 +74,18 @@ class LanguageRu extends Language {
 	 *     "Сделано $1 {{PLURAL:$1|изменение|изменения|изменений}}"
 	 *   message without number
 	 *     "Действие не может быть выполнено по {{PLURAL:$1|следующей причине|следующим причинам}}:"
+	 * @param $count int
+	 * @param $forms array
 	 *
+	 * @return string
 	 */
-
 	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];
 
-		// FIXME: CLDR defines 4 plural forms. Form with decimals missing.
+		// @todo FIXME: CLDR defines 4 plural forms. Form with decimals missing.
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru
 		$forms = $this->preConvertPlural( $forms, 3 );
 
@@ -93,10 +102,14 @@ class LanguageRu extends Language {
 		}
 	}
 
-	/*
+	/**
 	 * Four-digit number should be without group commas (spaces)
 	 * See manual of style at http://ru.wikipedia.org/wiki/Википедия:Оформление_статей
 	 * So "1 234 567", "12 345" but "1234"
+	 *
+	 * @param $_ string
+	 *
+	 * @return string
 	 */
 	function commafy( $_ ) {
 		if ( preg_match( '/^-?\d{1,4}(\.\d*)?$/', $_ ) ) {