http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97296
Revision: 97296 Author: nikerabbit Date: 2011-09-16 16:11:54 +0000 (Fri, 16 Sep 2011) Log Message: ----------- * (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces Modified Paths: -------------- trunk/phase3/RELEASE-NOTES-1.18 trunk/phase3/includes/DefaultSettings.php trunk/phase3/languages/Language.php Modified: trunk/phase3/RELEASE-NOTES-1.18 =================================================================== --- trunk/phase3/RELEASE-NOTES-1.18 2011-09-16 15:44:53 UTC (rev 97295) +++ trunk/phase3/RELEASE-NOTES-1.18 2011-09-16 16:11:54 UTC (rev 97296) @@ -626,6 +626,7 @@ (Devanagari) (ks-deva). Defaults to ks-arab. * (bug 30864) Use bengali numerals for <ol> for Assamese * (bug 30817) Restored linktrail for kk (Kazakh) +* (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces === Other changes in 1.18 === * Removed legacy wgAjaxWatch javascript global object, no longer in use. Modified: trunk/phase3/includes/DefaultSettings.php =================================================================== --- trunk/phase3/includes/DefaultSettings.php 2011-09-16 15:44:53 UTC (rev 97295) +++ trunk/phase3/includes/DefaultSettings.php 2011-09-16 16:11:54 UTC (rev 97296) @@ -2631,6 +2631,11 @@ $wgExtraNamespaces = array(); /** + * Same as above, but for namespaces with gender distinction. + */ +$wgExtraGenderNamespaces = array(); + +/** * Namespace aliases * These are alternate names for the primary localised namespace names, which * are defined by $wgExtraNamespaces and the language file. If a page is Modified: trunk/phase3/languages/Language.php =================================================================== --- trunk/phase3/languages/Language.php 2011-09-16 15:44:53 UTC (rev 97295) +++ trunk/phase3/languages/Language.php 2011-09-16 16:11:54 UTC (rev 97296) @@ -409,7 +409,9 @@ * @since 1.18 */ function getGenderNsText( $index, $gender ) { - $ns = self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); + global $wgExtraGenderNamespaces; + + $ns = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); return isset( $ns[$index][$gender] ) ? $ns[$index][$gender] : $this->getNsText( $index ); } @@ -420,7 +422,8 @@ * @since 1.18 */ function needsGenderDistinction() { - $aliases = self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); + global $wgExtraGenderNamespaces; + $aliases = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); return count( $aliases ) > 0; } @@ -456,7 +459,8 @@ } } - $genders = self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); + global $wgExtraGenderNamespaces; + $genders = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); foreach ( $genders as $index => $forms ) { foreach ( $forms as $alias ) { $aliases[$alias] = $index; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs