jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated Language::getLanguageName(s)()
......................................................................
Replace deprecated Language::getLanguageName(s)()
Change-Id: Icc13e1c41b13b3e406b03bf87a457fa0b4cf9cd0
---
M includes/pages/TranslatePage.php
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/pages/TranslatePage.php b/includes/pages/TranslatePage.php
index 93867d5..a6f43a6 100644
--- a/includes/pages/TranslatePage.php
+++ b/includes/pages/TranslatePage.php
@@ -72,8 +72,9 @@
}
$secondary = $params[1];
- $primaryName =
$this->specialPage->getLanguage()->getLanguageName( $primary );
- $secondaryName =
$this->specialPage->getLanguage()->getLanguageName( $secondary );
+ $inLanguage = $this->specialPage->getLanguage()->getCode();
+ $primaryName = Language::fetchLanguageName( $primary,
$inLanguage );
+ $secondaryName = Language::fetchLanguageName( $secondary,
$inLanguage );
if ( strval( $secondaryName ) === '' ) {
$out->addWikiMsg( 'securepoll-invalid-language',
$secondary );
$this->showLanguageSelector( $primary );
@@ -167,7 +168,7 @@
array( 'id' => 'secondary_lang', 'name' =>
'secondary_lang' )
) . "\n";
- $languages = Language::getLanguageNames();
+ $languages = Language::fetchLanguageNames();
ksort( $languages );
foreach ( $languages as $code => $name ) {
$s .= "\n" . Xml::option( "$code - $name", $code, $code
== $selectedCode );
--
To view, visit https://gerrit.wikimedia.org/r/275550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc13e1c41b13b3e406b03bf87a457fa0b4cf9cd0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
