* (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 110d1e6..e95f3c8 100644 (file)
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -626,6 +626,7 @@ changes to languages because of Bugzilla reports.
   (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.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 80c85bc..4e30d27 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2630,6 +2630,11 @@ $wgMetaNamespaceTalk = false;
 #            );
 $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

diff --git a/languages/Language.php b/languages/Language.php
index 8723a97..a1eba50 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -409,7 +409,9 @@ class Language {
         * @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 @@ class Language {
         * @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 @@ class Language {
                                }
                        }
 
-                       $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;