http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97461
Revision: 97461
Author: nikerabbit
Date: 2011-09-19 10:43:00 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
* (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces
Modified Paths:
--------------
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2011-09-19 09:04:39 UTC (rev 97460)
+++ trunk/phase3/languages/Language.php 2011-09-19 10:43:00 UTC (rev 97461)
@@ -428,9 +428,19 @@
* @since 1.18
*/
function needsGenderDistinction() {
- global $wgExtraGenderNamespaces;
- $aliases = $wgExtraGenderNamespaces +
self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' );
- return count( $aliases ) > 0;
+ global $wgExtraGenderNamespaces, $wgExtraNamespaces;
+ if ( count( $wgExtraGenderNamespaces ) > 0 ) {
+ // $wgExtraGenderNamespaces overrides everything
+ return true;
+ } elseif( isset( $wgExtraNamespaces[NS_USER] ) && isset(
$wgExtraNamespaces[NS_USER_TALK] ) ) {
+ /// @todo There may be other gender namespace than
NS_USER & NS_USER_TALK in the future
+ // $wgExtraNamespaces overrides any gender aliases
specified in i18n files
+ return false;
+ } else {
+ // Check what is in i18n files
+ $alises = self::$dataCache->getItem( $this->mCode,
'namespaceGenderAliases' );
+ return count( $aliases ) > 0;
+ }
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
