| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -438,7 +438,7 @@ |
| 439 | 439 | return false; |
| 440 | 440 | } else { |
| 441 | 441 | // Check what is in i18n files |
| 442 | | - $alises = self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); |
| | 442 | + $aliases = self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); |
| 443 | 443 | return count( $aliases ) > 0; |
| 444 | 444 | } |
| 445 | 445 | } |
| — | — | @@ -475,6 +475,7 @@ |
| 476 | 476 | } |
| 477 | 477 | } |
| 478 | 478 | |
| | 479 | + // <Nikerabbit> make $wgExtraNamespaces take precedence over $namespaceGenderAliases when $wgExtraGenderNamespaces are not defined |
| 479 | 480 | global $wgExtraGenderNamespaces; |
| 480 | 481 | $genders = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); |
| 481 | 482 | foreach ( $genders as $index => $forms ) { |
| — | — | @@ -535,12 +536,12 @@ |
| 536 | 537 | * short names for language variants used for language conversion links. |
| 537 | 538 | * |
| 538 | 539 | * @param $code String |
| 539 | | - * @param $usemsg Use the "variantname-xyz" message if it exists |
| | 540 | + * @param $usemsg bool Use the "variantname-xyz" message if it exists |
| 540 | 541 | * @return string |
| 541 | 542 | */ |
| 542 | 543 | function getVariantname( $code, $usemsg = true ) { |
| 543 | 544 | $msg = "variantname-$code"; |
| 544 | | - $codeArray = list( $rootCode ) = explode( '-', $code ); |
| | 545 | + list( $rootCode ) = explode( '-', $code ); |
| 545 | 546 | if( $usemsg && wfMessage( $msg )->exists() ) { |
| 546 | 547 | return $this->getMessageFromDB( $msg ); |
| 547 | 548 | } elseif( $name = self::getLanguageName( $code ) ) { |