wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-11 17:01:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated Language::isValidCode/isSupportedLanguage

Browse source 
Bug: T325974
Change-Id: I0245ea66abeebd9ae9b6d1edce9e8e93a479fdc0
This commit is contained in:
Umherirrender 2022-12-28 14:17:19 +01:00
parent bf4bdddb41
commit a20054fa34
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/Engines/LuaCommon/LanguageLibrary.php
View file

@ -81,7 +81,7 @@ class LanguageLibrary extends LibraryBase {
*/
public function isSupportedLanguage( $code ) {
$this->checkType( 'isSupportedLanguage', 1, $code, 'string' );
return [ Language::isSupportedLanguage( $code ) ];
return [ MediaWikiServices::getInstance()->getLanguageNameUtils()->isSupportedLanguage( $code ) ];
}
/**
@ -92,7 +92,7 @@ class LanguageLibrary extends LibraryBase {
*/
public function isKnownLanguageTag( $code ) {
$this->checkType( 'isKnownLanguageTag', 1, $code, 'string' );
return [ Language::isKnownLanguageTag( $code ) ];
return [ MediaWikiServices::getInstance()->getLanguageNameUtils()->isKnownLanguageTag( $code ) ];
}
/**
@ -103,7 +103,7 @@ class LanguageLibrary extends LibraryBase {
*/
public function isValidCode( $code ) {
$this->checkType( 'isValidCode', 1, $code, 'string' );
return [ Language::isValidCode( $code ) ];
return [ MediaWikiServices::getInstance()->getLanguageNameUtils()->isValidCode( $code ) ];
}
/**
@ -114,7 +114,7 @@ class LanguageLibrary extends LibraryBase {
*/
public function isValidBuiltInCode( $code ) {
$this->checkType( 'isValidBuiltInCode', 1, $code, 'string' );
return [ (bool)Language::isValidBuiltInCode( $code ) ];
return [ MediaWikiServices::getInstance()->getLanguageNameUtils()->isValidBuiltInCode( $code ) ];
}
/**
@ -176,8 +176,9 @@ class LanguageLibrary extends LibraryBase {
if ( count( $this->langCache ) > $this->maxLangCacheSize ) {
throw new LuaError( 'too many language codes requested' );
}
if ( Language::isValidCode( $code ) ) {
$this->langCache[$code] = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( $code );
$services = MediaWikiServices::getInstance();
if ( $services->getLanguageNameUtils()->isValidCode( $code ) ) {
$this->langCache[$code] = $services->getLanguageFactory()->getLanguage( $code );
} else {
throw new LuaError( "language code '$code' is invalid" );
}

5
includes/Engines/LuaCommon/MessageLibrary.php
View file

@ -2,7 +2,6 @@
namespace MediaWiki\Extension\Scribunto\Engines\LuaCommon;
use Language;
use MediaWiki\MediaWikiServices;
use Message;
use RawMessage;
@ -43,7 +42,9 @@ class MessageLibrary extends LibraryBase {
} else {
$msg = Message::newFallbackSequence( $data['keys'] );
}
if ( is_string( $data['lang'] ) && !Language::isValidCode( $data['lang'] ) ) {
if ( is_string( $data['lang'] ) &&
!MediaWikiServices::getInstance()->getLanguageNameUtils()->isValidCode( $data['lang'] )
) {
throw new LuaError( "language code '{$data['lang']}' is invalid" );
} else {
$msg->inLanguage( $data['lang'] );