From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 2 Apr 2014 18:29:40 +0000 (+0000)
Subject: Merge "Cleaning up function definitions in Language.php"
X-Git-Tag: 1.31.0-rc.0~16396
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=912f53996e93cc3842f00b261f91e5137701c277;hp=fbf97f572cd26f3dadd323ee31036ba7a1d9d11f;p=lhc%2Fweb%2Fwiklou.git

Merge "Cleaning up function definitions in Language.php"
---

diff --git a/languages/Language.php b/languages/Language.php
index 8c68b60c2a..2b98a18305 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -612,6 +612,7 @@ class Language {
 
 	/**
 	 * Returns gender-dependent namespace alias if available.
+	 * See https://www.mediawiki.org/wiki/Manual:$wgExtraGenderNamespaces
 	 * @param $index Int: namespace index
 	 * @param $gender String: gender key (male, female... )
 	 * @return String
@@ -625,8 +626,8 @@ class Language {
 	}
 
 	/**
-	 * Whether this language makes distinguishes genders for example in
-	 * namespaces.
+	 * Whether this language uses gender-dependent namespace aliases.
+	 * See https://www.mediawiki.org/wiki/Manual:$wgExtraGenderNamespaces
 	 * @return bool
 	 * @since 1.18
 	 */
@@ -3590,7 +3591,7 @@ class Language {
 	}
 	/**
 	 * Provides an alternative text depending on specified gender.
-	 * Usage {{gender:username|masculine|feminine|neutral}}.
+	 * Usage {{gender:username|masculine|feminine|unknown}}.
 	 * username is optional, in which case the gender of current user is used,
 	 * but only in (some) interface messages; otherwise default gender is used.
 	 *
@@ -3598,9 +3599,9 @@ class Language {
 	 * given, it will be returned unconditionally. These details are implied by
 	 * the caller and cannot be overridden in subclasses.
 	 *
-	 * If more than one form is given, the default is to use the neutral one
-	 * if it is specified, and to use the masculine one otherwise. These
-	 * details can be overridden in subclasses.
+	 * If three forms are given, the default is to use the third (unknown) form.
+	 * If fewer than three forms are given, the default is to use the first (masculine) form.
+	 * These details can be overridden in subclasses.
 	 *
 	 * @param $gender string
 	 * @param $forms array