X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fcollation%2FCollation.php;h=ab3c6fb432b1eb057fb401628674a531120703f9;hp=f52dcae017cdc7a80e6694eb4ab364e6ba2ddd64;hb=74d04edec385aa86ee01943b9a27475d79f74e78;hpb=e85682ed109e13432f8ee376e16eb89325f05373 diff --git a/includes/collation/Collation.php b/includes/collation/Collation.php index f52dcae017..ab3c6fb432 100644 --- a/includes/collation/Collation.php +++ b/includes/collation/Collation.php @@ -20,6 +20,8 @@ * @file */ +use MediaWiki\MediaWikiServices; + /** * @since 1.16.3 * @author Tim Starling @@ -46,13 +48,12 @@ abstract class Collation { * @return Collation */ public static function factory( $collationName ) { - global $wgContLang; - switch ( $collationName ) { case 'uppercase': return new UppercaseCollation; case 'numeric': - return new NumericUppercaseCollation( $wgContLang ); + return new NumericUppercaseCollation( + MediaWikiServices::getInstance()->getContentLanguage() ); case 'identity': return new IdentityCollation; case 'uca-default': @@ -61,14 +62,10 @@ abstract class Collation { return new IcuCollation( 'root-u-kn' ); case 'xx-uca-ckb': return new CollationCkb; - case 'xx-uca-et': - return new CollationEt; case 'uppercase-ab': return new AbkhazUppercaseCollation; case 'uppercase-ba': return new BashkirUppercaseCollation; - case 'uppercase-se': - return new NorthernSamiUppercaseCollation; default: $match = []; if ( preg_match( '/^uca-([A-Za-z@=-]+)$/', $collationName, $match ) ) {