From 810610a153ba04c96efd6c108b7580ce0bcd96e0 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 29 May 2011 15:03:33 +0000
Subject: [PATCH] Some language love

---
 languages/Language.php                  | 10 +++++++---
 languages/classes/LanguageAm.php        |  5 +++++
 languages/classes/LanguageBe_tarask.php |  6 ++++++
 languages/classes/LanguageFr.php        |  5 +++++
 languages/classes/LanguageGd.php        |  4 ++++
 languages/classes/LanguageHe.php        |  2 ++
 languages/classes/LanguageHy.php        |  6 ++++++
 languages/classes/LanguageKaa.php       |  2 ++
 languages/classes/LanguageKk_cyrl.php   |  1 -
 languages/classes/LanguageKsh.php       |  5 +++++
 languages/classes/LanguageMg.php        |  5 +++++
 languages/classes/LanguageNso.php       |  5 +++++
 languages/classes/LanguageRu.php        |  4 +++-
 languages/classes/LanguageWa.php        |  5 +++++
 languages/classes/LanguageYue.php       |  4 ++++
 languages/classes/LanguageZh_hans.php   |  4 ++++
 16 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/languages/Language.php b/languages/Language.php
index 8047bc059c..b64bf0063d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -201,6 +201,8 @@ class Language {
 	 * Returns true if a language code string is of a valid form, whether or
 	 * not it exists. This includes codes which are used solely for
 	 * customisation via the MediaWiki namespace.
+	 *
+	 * @return bool
 	 */
 	public static function isValidCode( $code ) {
 		return
@@ -1564,8 +1566,10 @@ class Language {
 
 	/**
 	 * Get a format string for a given type and preference
-	 * @param $type May be date, time or both
-	 * @param $pref The format name as it appears in Messages*.php
+	 * @param $type string May be date, time or both
+	 * @param $pref string The format name as it appears in Messages*.php
+	 *
+	 * @return string
 	 */
 	function getDateFormatString( $type, $pref ) {
 		if ( !isset( $this->dateFormatStrings[$type][$pref] ) ) {
@@ -2932,7 +2936,7 @@ class Language {
 	 * @param $filename string $prefix . $languageCode . $suffix
 	 * @param $prefix string Prefix before the language code
 	 * @param $suffix string Suffix after the language code
-	 * @return Language code, or false if $prefix or $suffix isn't found
+	 * @return string Language code, or false if $prefix or $suffix isn't found
 	 */
 	static function getCodeFromFileName( $filename, $prefix = 'Language', $suffix = '.php' ) {
 		$m = null;
diff --git a/languages/classes/LanguageAm.php b/languages/classes/LanguageAm.php
index 77374d3c18..29ae9c1197 100644
--- a/languages/classes/LanguageAm.php
+++ b/languages/classes/LanguageAm.php
@@ -7,6 +7,11 @@
 class LanguageAm extends Language {
 	/**
 	 * Use singular form for zero
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php
index af2271d0e0..c7920e5ecc 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -18,6 +18,12 @@ class LanguageBe_tarask extends Language {
 	 * $wordform3 - plural form (for 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 26...)
 	 */
 
+	/**
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
+	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
 
diff --git a/languages/classes/LanguageFr.php b/languages/classes/LanguageFr.php
index dec1204ca1..3e7c970dd4 100644
--- a/languages/classes/LanguageFr.php
+++ b/languages/classes/LanguageFr.php
@@ -7,6 +7,11 @@
 class LanguageFr extends Language {
 	/**
 	 * Use singular form for zero (see bug 7309)
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageGd.php b/languages/classes/LanguageGd.php
index 2a11fd7c26..5fe3d058fc 100644
--- a/languages/classes/LanguageGd.php
+++ b/languages/classes/LanguageGd.php
@@ -19,6 +19,10 @@ class LanguageGd extends Language {
 	 * $forms[4] - 3-10, 13-19
 	 * $forms[5] - 0, 20, rest
 	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageHe.php b/languages/classes/LanguageHe.php
index 95beca79d3..e65feee975 100644
--- a/languages/classes/LanguageHe.php
+++ b/languages/classes/LanguageHe.php
@@ -17,6 +17,8 @@ class LanguageHe extends Language {
 	 *
 	 * @param $word String: the word to convert
 	 * @param $case String: the case
+	 *
+	 * @return string
 	 */
 	public function convertGrammar( $word, $case ) {
 		global $wgGrammarForms;
diff --git a/languages/classes/LanguageHy.php b/languages/classes/LanguageHy.php
index 1201dff955..714d9cef7e 100644
--- a/languages/classes/LanguageHy.php
+++ b/languages/classes/LanguageHy.php
@@ -48,6 +48,12 @@ class LanguageHy extends Language {
 		return $word;
 	}
 
+	/**
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
+	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 2 );
diff --git a/languages/classes/LanguageKaa.php b/languages/classes/LanguageKaa.php
index de3b17c42d..5b6e76db82 100644
--- a/languages/classes/LanguageKaa.php
+++ b/languages/classes/LanguageKaa.php
@@ -22,6 +22,8 @@ class LanguageKaa extends Language {
 
 	/**
 	 * It fixes issue with ucfirst for transforming 'i' to 'Ä°'
+	 *
+	 * @return string
 	 */
 	function ucfirst ( $string ) {
 		if ( substr( $string, 0, 1 ) === 'i' ) {
diff --git a/languages/classes/LanguageKk_cyrl.php b/languages/classes/LanguageKk_cyrl.php
index 78febae1f3..3b65efacf1 100644
--- a/languages/classes/LanguageKk_cyrl.php
+++ b/languages/classes/LanguageKk_cyrl.php
@@ -11,7 +11,6 @@ class LanguageKk_cyrl extends Language {
 	/**
 	 * Cases: genitive, dative, accusative, locative, ablative, comitative + possessive forms
 	 */
-
 	function convertGrammarKk_cyrl( $word, $case ) {
 		global $wgGrammarForms;
 		if ( isset( $wgGrammarForms['kk-kz'][$case][$word] ) ) {
diff --git a/languages/classes/LanguageKsh.php b/languages/classes/LanguageKsh.php
index 65126e1129..026bdfec1b 100644
--- a/languages/classes/LanguageKsh.php
+++ b/languages/classes/LanguageKsh.php
@@ -155,6 +155,11 @@ class LanguageKsh extends Language {
 
 	/**
 	 * Handle cases of (1, other, 0) or (1, other)
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageMg.php b/languages/classes/LanguageMg.php
index 54ef408ff6..111dda3548 100644
--- a/languages/classes/LanguageMg.php
+++ b/languages/classes/LanguageMg.php
@@ -7,6 +7,11 @@
 class LanguageMg extends Language {
 	/**
 	 * Use singular form for zero
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageNso.php b/languages/classes/LanguageNso.php
index 9ff89039d8..4026332038 100644
--- a/languages/classes/LanguageNso.php
+++ b/languages/classes/LanguageNso.php
@@ -7,6 +7,11 @@
 class LanguageNso extends Language {
 	/**
 	 * Use singular form for zero
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php
index 8169885be6..d5c0d524a3 100644
--- a/languages/classes/LanguageRu.php
+++ b/languages/classes/LanguageRu.php
@@ -67,9 +67,11 @@ 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 ''; }
 
diff --git a/languages/classes/LanguageWa.php b/languages/classes/LanguageWa.php
index 0cb439d083..ea4c4e58e3 100644
--- a/languages/classes/LanguageWa.php
+++ b/languages/classes/LanguageWa.php
@@ -11,6 +11,11 @@
 class LanguageWa extends Language {
 	/**
 	 * Use singular form for zero
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php
index 75f4a83aa2..537ffc1944 100644
--- a/languages/classes/LanguageYue.php
+++ b/languages/classes/LanguageYue.php
@@ -20,6 +20,10 @@ class LanguageYue extends Language {
 		return $s;
 	}
 
+	/**
+	 * @param $string
+	 * @return string
+	 */
 	function normalizeForSearch( $string ) {
 		wfProfileIn( __METHOD__ );
 
diff --git a/languages/classes/LanguageZh_hans.php b/languages/classes/LanguageZh_hans.php
index 137f094140..2fcb7de2ef 100644
--- a/languages/classes/LanguageZh_hans.php
+++ b/languages/classes/LanguageZh_hans.php
@@ -21,6 +21,10 @@ class LanguageZh_hans extends Language {
 		return $s;
 	}
 
+	/**
+	 * @param $s
+	 * @return string
+	 */
 	function normalizeForSearch( $s ) {
 		wfProfileIn( __METHOD__ );
 
-- 
2.20.1