Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/211119
Change subject: Fetch the actual wgLanguageCode when we miserably failed
......................................................................
Fetch the actual wgLanguageCode when we miserably failed
We run wmfLoadInitialiseSettings() just above, so the actual
configuration must be accessible in a way or another.
Bug: T99059
Change-Id: I3c7fa0ad9540bad96bd63cb99b45caea4d754b88
---
M SiteMatrix_body.php
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix
refs/changes/19/211119/1
diff --git a/SiteMatrix_body.php b/SiteMatrix_body.php
index e794812..429066f 100644
--- a/SiteMatrix_body.php
+++ b/SiteMatrix_body.php
@@ -48,8 +48,14 @@
foreach ( $wgSiteMatrixSites as $site => $conf ) {
$this->sites[] = $site;
- $this->names[$site] = $conf['name'] . ( isset(
$conf['prefix'] ) ?
- '<br />' . $conf['prefix'] : '' );
+ if ( isset( $conf['name'] ) ) {
+ $name = $conf['name'];
+ } else {
+ $langCode =
$wgConf->settings['wgLanguageCode'][$site];
+ $name = Language::fetchLanguageName( $langCode
);
+ }
+ $prefix = isset( $conf['prefix'] ) ? '<br />' .
$conf['prefix'] : '';
+ $this->names[$site] = $name . $prefix;
$this->hosts[$site] = $conf['host'];
}
--
To view, visit https://gerrit.wikimedia.org/r/211119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c7fa0ad9540bad96bd63cb99b45caea4d754b88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SiteMatrix
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <federicol...@tiscali.it>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
