bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated Language::fetchLanguageNames

Browse Source 
Bug: T325962
Change-Id: I8d5724cd9b79639a0b2001759a70b8d8106c74ee
This commit is contained in:
Umherirrender
2022-12-27 17:22:26 +01:00
parent eaf26dccd3
commit 7ea30c85bf
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/LanguageNameIndexer.php
View File

@@ -24,6 +24,9 @@ if ( $IP === false ) {
} }
require_once "$IP/maintenance/Maintenance.php"; require_once "$IP/maintenance/Maintenance.php";
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MediaWikiServices;
class LanguageNameIndexer extends Maintenance { class LanguageNameIndexer extends Maintenance {
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
@@ -51,7 +54,8 @@ class LanguageNameIndexer extends Maintenance {
// Languages and their names in different languages from Names.php and the cldr extension // Languages and their names in different languages from Names.php and the cldr extension
// This comes after $ulsLanguages so that for example the als/gsw mixup is using the code // This comes after $ulsLanguages so that for example the als/gsw mixup is using the code
// used in the Wikimedia world. // used in the Wikimedia world.
$mwLanguages = Language::fetchLanguageNames( null, 'all' ); $mwLanguages = MediaWikiServices::getInstance()->getLanguageNameUtils()
->getLanguageNames( LanguageNameUtils::AUTONYMS, LanguageNameUtils::ALL );
foreach ( array_keys( $mwLanguages ) as $languageCode ) { foreach ( array_keys( $mwLanguages ) as $languageCode ) {
$languageNames[ $languageCode ] = LanguageNames::getNames( $languageCode, 0, 2 ); $languageNames[ $languageCode ] = LanguageNames::getNames( $languageCode, 0, 2 );
} }

7
includes/ResourceLoaderULSModule.php
View File

@@ -21,7 +21,8 @@
namespace UniversalLanguageSelector; namespace UniversalLanguageSelector;
use Language; use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MediaWikiServices;
use ResourceLoader; use ResourceLoader;
use ResourceLoaderContext; use ResourceLoaderContext;
use ResourceLoaderModule; use ResourceLoaderModule;
@@ -41,9 +42,9 @@ class ResourceLoaderULSModule extends ResourceLoaderModule {
*/ */
private function getData( $languageCode ) { private function getData( $languageCode ) {
$vars = []; $vars = [];
$vars['wgULSLanguages'] = Language::fetchLanguageNames( $vars['wgULSLanguages'] = MediaWikiServices::getInstance()->getLanguageNameUtils()->getLanguageNames(
$languageCode, $languageCode,
'mwfile' LanguageNameUtils::SUPPORTED
); );
return $vars; return $vars;
} }