jenkins-bot has submitted this change and it was merged.
Change subject: Remove last bits of MediaWiki 1.19 compatibility
......................................................................
Remove last bits of MediaWiki 1.19 compatibility
Compatibility with MediaWiki 1.19 had already been dropped and this hadn't
been removed yet.
Change-Id: I63788ef1d4a6eb87e4280ea2625579a7874eaff8
---
M ResourceLoaderULSModule.php
M UniversalLanguageSelector.hooks.php
M data/LanguageNameIndexer.php
3 files changed, 8 insertions(+), 24 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ResourceLoaderULSModule.php b/ResourceLoaderULSModule.php
index 895b06d..88bf275 100644
--- a/ResourceLoaderULSModule.php
+++ b/ResourceLoaderULSModule.php
@@ -36,14 +36,9 @@
*/
protected function getData() {
$vars = array();
- if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
- // since 1.20
- $vars['wgULSLanguages'] = Language::fetchLanguageNames(
- $this->language->getCode(), 'mwfile'
- );
- } else {
- $vars['wgULSLanguages'] = Language::getLanguageNames(
false );
- }
+ $vars['wgULSLanguages'] = Language::fetchLanguageNames(
+ $this->language->getCode(), 'mwfile'
+ );
return $vars;
}
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 468856b..6486120 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -101,7 +101,7 @@
$lang = $context->getLanguage();
$personal_urls = array(
'uls' => array(
- 'text' => $lang->getLanguageName(
$lang->getCode() ),
+ 'text' => $lang->fetchLanguageName(
$lang->getCode() ),
'href' => '#',
'class' => 'uls-trigger',
'active' => true
@@ -113,11 +113,7 @@
protected static function isSupportedLanguage( $language ) {
wfProfileIn( __METHOD__ );
- if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
- $supported = Language::fetchLanguageNames( null,
'mwfile' ); // since 1.20
- } else {
- $supported = Language::getLanguageNames( false );
- }
+ $supported = Language::fetchLanguageNames( null, 'mwfile' ); //
since 1.20
wfProfileOut( __METHOD__ );
return isset( $supported[$language] );
@@ -129,11 +125,8 @@
*/
protected static function getDefaultLanguage( array $preferred ) {
wfProfileIn( __METHOD__ );
- if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
- $supported = Language::fetchLanguageNames( null,
'mwfile' ); // since 1.20
- } else {
- $supported = Language::getLanguageNames( false );
- }
+ $supported = Language::fetchLanguageNames( null, 'mwfile' ); //
since 1.20
+
// look for a language that is acceptable to the client
// and known to the wiki.
foreach ( $preferred as $code => $weight ) {
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index 273eb2f..33aa2d2 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -33,11 +33,7 @@
}
public function execute() {
- if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
- $languages = Language::fetchLanguageNames( null, 'all'
); // since 1.20
- } else {
- $languages = Language::getLanguageNames( false );
- }
+ $languages = Language::fetchLanguageNames( null, 'all' ); //
since 1.20
$all = array();
$buckets = array();
--
To view, visit https://gerrit.wikimedia.org/r/69105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63788ef1d4a6eb87e4280ea2625579a7874eaff8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
