From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 27 Dec 2013 21:25:34 +0000 (-0500)
Subject: API: Include variant name in meta=siteinfo
X-Git-Tag: 1.31.0-rc.0~17458^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=5c620805cc666cb17dd906ce626c216bbf5c10fc;p=lhc%2Fweb%2Fwiklou.git

API: Include variant name in meta=siteinfo

For languages with variants, we're already returning the list of variant
codes in meta=siteinfo&siprop=general. Clients may have use for the
variant's human-readable name too, and we can easily add it to the
datastructure.

Change-Id: I6c7ebf43a699a0b2346cb0fdeef6487217992f5c
---

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index a94f5bbf0a..697ae99dfd 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -199,7 +199,10 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 		if ( $wgContLang->hasVariants() ) {
 			$variants = array();
 			foreach ( $wgContLang->getVariants() as $code ) {
-				$variants[] = array( 'code' => $code );
+				$variants[] = array(
+					'code' => $code,
+					'name' => $wgContLang->getVariantname( $code ),
+				);
 			}
 			$data['variants'] = $variants;
 			$this->getResult()->setIndexedTagName( $data['variants'], 'lang' );