Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97915
Change subject: Cleanup variable use in getLanguages
......................................................................
Cleanup variable use in getLanguages
Change-Id: Ie480f701aa2b117fd73f3f1e2cca1cc9994b2605
---
M includes/SkinTemplate.php
1 file changed, 20 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/97915/1
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 7647e51..dde3f37 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -134,15 +134,14 @@
return array();
}
- $out = $this->getOutput();
$userLang = $this->getLanguage();
-
$languageLinks = array();
- foreach ( $out->getLanguageLinks() as $languageLinkText ) {
+ foreach ( $this->getOutput()->getLanguageLinks() as
$languageLinkText ) {
$languageLinkParts = explode( ':', $languageLinkText, 2
);
$class = 'interlanguage-link interwiki-' .
$languageLinkParts[0];
unset( $languageLinkParts );
+
$languageLinkTitle = Title::newFromText(
$languageLinkText );
if ( $languageLinkTitle ) {
$ilInterwikiCode =
$languageLinkTitle->getInterwiki();
@@ -156,22 +155,33 @@
// CLDR extension or similar is required to
localize the language name;
// otherwise we'll end up with the autonym
again.
- $ilLangLocalName = Language::fetchLanguageName(
$ilInterwikiCode, $userLang->getCode() );
+ $ilLangLocalName = Language::fetchLanguageName(
+ $ilInterwikiCode,
+ $userLang->getCode()
+ );
- if ( $languageLinkTitle->getText() === '' ) {
- $ilTitle = wfMessage(
'interlanguage-link-title-langonly', $ilLangLocalName )->text();
+ $languageLinkTitleText =
$languageLinkTitle->getText();
+ if ( $languageLinkTitleText === '' ) {
+ $ilTitle = wfMessage(
+
'interlanguage-link-title-langonly',
+ $ilLangLocalName
+ )->text();
} else {
- $ilTitle = wfMessage(
'interlanguage-link-title', $languageLinkTitle->getText(),
- $ilLangLocalName )->text();
+ $ilTitle = wfMessage(
+ 'interlanguage-link-title',
+ $languageLinkTitleText,
+ $ilLangLocalName
+ )->text();
}
+ $ilInterwikiCodeBCP47 = wfBCP47(
$ilInterwikiCode );
$languageLinks[] = array(
'href' =>
$languageLinkTitle->getFullURL(),
'text' => $ilLangName,
'title' => $ilTitle,
'class' => $class,
- 'lang' => wfBCP47( $ilInterwikiCode ),
- 'hreflang' => wfBCP47( $ilInterwikiCode
),
+ 'lang' => $ilInterwikiCodeBCP47,
+ 'hreflang' => $ilInterwikiCodeBCP47,
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/97915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie480f701aa2b117fd73f3f1e2cca1cc9994b2605
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
