dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add 3D filetype for STL files"
[lhc/web/wiklou.git]
/
includes
/
collation
/
Collation.php
diff --git
a/includes/collation/Collation.php
b/includes/collation/Collation.php
index
881c8c2
..
d009168
100644
(file)
--- a/
includes/collation/Collation.php
+++ b/
includes/collation/Collation.php
@@
-46,11
+46,13
@@
abstract class Collation {
* @return Collation
*/
public static function factory( $collationName ) {
* @return Collation
*/
public static function factory( $collationName ) {
+ global $wgContLang;
+
switch ( $collationName ) {
case 'uppercase':
return new UppercaseCollation;
case 'numeric':
switch ( $collationName ) {
case 'uppercase':
return new UppercaseCollation;
case 'numeric':
- return new NumericUppercaseCollation;
+ return new NumericUppercaseCollation
( $wgContLang )
;
case 'identity':
return new IdentityCollation;
case 'uca-default':
case 'identity':
return new IdentityCollation;
case 'uca-default':
@@
-61,9
+63,13
@@
abstract class Collation {
return new CollationCkb;
case 'xx-uca-et':
return new CollationEt;
return new CollationCkb;
case 'xx-uca-et':
return new CollationEt;
+ case 'xx-uca-fa':
+ return new CollationFa;
+ case 'uppercase-ba':
+ return new BashkirUppercaseCollation;
default:
$match = [];
default:
$match = [];
- if ( preg_match( '/^uca-([a-z@=-]+)$/', $collationName, $match ) ) {
+ if ( preg_match( '/^uca-([
A-Z
a-z@=-]+)$/', $collationName, $match ) ) {
return new IcuCollation( $match[1] );
}
return new IcuCollation( $match[1] );
}