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

LanguageNameSearch: Remove usage of deprecated Language functions

Browse Source 
Change-Id: Ia8f2961550ccb4e0032cd7e24d36628c675873a9
This commit is contained in:
Abijeet
2021-11-16 12:46:55 +05:30
committed by jenkins-bot
parent da4d965739
commit 98252ee386
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/LanguageNameSearch.php
View File

@@ -1,4 +1,7 @@
<?php <?php
use MediaWiki\MediaWikiServices;
/** /**
* Cross-Language Language name search * Cross-Language Language name search
* *
@@ -46,9 +49,11 @@ class LanguageNameSearch {
return []; return [];
} }
$languageNameUtils = MediaWikiServices::getInstance()->getLanguageNameUtils();
// Always prefer exact language code match // Always prefer exact language code match
if ( Language::isKnownLanguageTag( $searchKey ) ) { if ( $languageNameUtils->isKnownLanguageTag( $searchKey ) ) {
$name = mb_strtolower( Language::fetchLanguageName( $searchKey, $userLanguage ) ); $name = mb_strtolower( $languageNameUtils->getLanguageName( $searchKey, $userLanguage ) );
// Check if language code is a prefix of the name // Check if language code is a prefix of the name
if ( strpos( $name, $searchKey ) === 0 ) { if ( strpos( $name, $searchKey ) === 0 ) {
$results[$searchKey] = $name; $results[$searchKey] = $name;
@@ -79,8 +84,8 @@ class LanguageNameSearch {
// Once we find a match, figure out the best name to display to the user // Once we find a match, figure out the best name to display to the user
// If $userLanguage is not provided (null), it is the same as autonym // If $userLanguage is not provided (null), it is the same as autonym
$candidates = [ $candidates = [
mb_strtolower( Language::fetchLanguageName( $code, $userLanguage ) ), mb_strtolower( $languageNameUtils->getLanguageName( $code, $userLanguage ) ),
mb_strtolower( Language::fetchLanguageName( $code, null ) ), mb_strtolower( $languageNameUtils->getLanguageName( $code, null ) ),
$name $name
]; ];