API: (bug 16726) siprop=namespacealiases should also list localized aliases

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 93f171a..e55bca0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -542,7 +542,8 @@ The following extensions are migrated into MediaWiki 1.14:
   property for hidden categories
 * New siprop parameter of 'extensions' to list all installed extensions
 * (bug 16672) Include canonical namespace name in
-  meta=siteinfo&siprop=namespaces. 
+  meta=siteinfo&siprop=namespaces.
+* (bug 16726) siprop=namespacealiases should also list localized aliases
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 06c5fc5..326f4fc 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -149,9 +149,11 @@ class ApiQuerySiteinfo extends ApiQueryBase {
        }
 
        protected function appendNamespaceAliases( $property ) {
-               global $wgNamespaceAliases;
+               global $wgNamespaceAliases, $wgLang;
+               $wgLang->load();
+               $aliases = array_merge($wgNamespaceAliases, $wgLang->namespaceAliases);
                $data = array();
-               foreach( $wgNamespaceAliases as $title => $ns ) {
+               foreach( $aliases as $title => $ns ) {
                        $item = array(
                                'id' => $ns
                        );