dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
5cfec93
)
Merge "Allow uca-sv@collation=standard to be a collation name."
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Jun 2013 18:48:21 +0000
(18:48 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Thu, 27 Jun 2013 18:48:21 +0000
(18:48 +0000)
includes/Collation.php
patch
|
blob
|
history
diff --git
a/includes/Collation.php
b/includes/Collation.php
index
1689cb3
..
b0252c7
100644
(file)
--- a/
includes/Collation.php
+++ b/
includes/Collation.php
@@
-49,7
+49,7
@@
abstract class Collation {
return new IcuCollation( 'root' );
default:
$match = array();
- if ( preg_match( '/^uca-([a-z-]+)$/', $collationName, $match ) ) {
+ if ( preg_match( '/^uca-([a-z
@=
-]+)$/', $collationName, $match ) ) {
return new IcuCollation( $match[1] );
}
@@
-214,6
+214,7
@@
class IcuCollation extends Collation {
'pt' => array(),
'ru' => array(),
'sv' => array( "Å", "Ä", "Ö" ),
+ 'sv@collation=standard' => array( "Å", "Ä", "Ö" ),
'uk' => array( "Ґ", "Ь" ),
'vi' => array( "Ă", "Â", "Đ", "Ê", "Ô", "Ơ", "Ư" ),
// Not verified, but likely correct