jenkins-bot has submitted this change and it was merged.
Change subject: Add backward compatibility for fetchLanguageNames
......................................................................
Add backward compatibility for fetchLanguageNames
Bug: 46737
Change-Id: Ife7c2834c2b2c4f2619b4a5d8e0b0aa1db595984
---
M ResourceLoaderULSModule.php
M UniversalLanguageSelector.hooks.php
M data/LanguageNameIndexer.php
3 files changed, 25 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ResourceLoaderULSModule.php b/ResourceLoaderULSModule.php
index dda8492..784db4f 100644
--- a/ResourceLoaderULSModule.php
+++ b/ResourceLoaderULSModule.php
@@ -33,9 +33,15 @@
*/
protected function getData() {
$vars = array();
- $vars['wgULSLanguages'] = Language::fetchLanguageNames(
- $this->language->getCode(), 'mwfile'
- );
+ if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+ // since 1.20
+ $vars['wgULSLanguages'] = Language::fetchLanguageNames(
+ $this->language->getCode(), 'mwfile'
+ );
+ } else {
+ $vars['wgULSLanguages'] = Language::getLanguageNames(
false );
+ }
+
return $vars;
}
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 4d26264..1aa0adc 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -105,7 +105,11 @@
protected static function isSupportedLanguage( $language ) {
wfProfileIn( __METHOD__ );
- $supported = Language::fetchLanguageNames( null, 'mwfile' );
+ if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+ $supported = Language::fetchLanguageNames( null,
'mwfile' ); // since 1.20
+ } else {
+ $supported = Language::getLanguageNames( false );
+ }
wfProfileOut( __METHOD__ );
return isset( $supported[$language] );
@@ -117,7 +121,11 @@
*/
protected static function getDefaultLanguage( array $preferred ) {
wfProfileIn( __METHOD__ );
- $supported = Language::fetchLanguageNames( null, 'mwfile' );
+ if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+ $supported = Language::fetchLanguageNames( null,
'mwfile' ); // since 1.20
+ } else {
+ $supported = Language::getLanguageNames( false );
+ }
// 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 b8df9c5..8c2820e 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -33,7 +33,12 @@
}
public function execute() {
- $languages = Language::fetchLanguageNames( null, 'all' );
+ if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+ $languages = Language::fetchLanguageNames( null, 'all'
); // since 1.20
+ } else {
+ $languages = Language::getLanguageNames( false );
+ }
+
$all = array();
$buckets = array();
foreach ( $languages as $code => $name ) {
--
To view, visit https://gerrit.wikimedia.org/r/61552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife7c2834c2b2c4f2619b4a5d8e0b0aa1db595984
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
