Tim Starling has submitted this change and it was merged.
Change subject: Revert "(bug 29788) Swedish Collation (uppercase-sv). Swaps Ä
and Æ"
......................................................................
Revert "(bug 29788) Swedish Collation (uppercase-sv). Swaps Ä and Æ"
This workaround is unnecessary now that I838484b9 was merged.
This reverts commit 13dc8ff88f48e0bb18750f5e98d50cdb8057c0d3.
Change-Id: I2cd22ad87eb7a56c5742b20c6089a4b8607e5614
---
M RELEASE-NOTES-1.21
M includes/AutoLoader.php
M includes/Collation.php
3 files changed, 0 insertions(+), 21 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 3737932..cbfafa2 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -96,8 +96,6 @@
* (bug 5346) Categories that are redirects will be displayed italic in
the category links section at the bottom of a page.
* (bug 43915) New maintenance script deleteEqualMessages.php.
-* New collation uppercase-sv, which is like uppercase, but adapted
- to Swedish sort order.
* WikiText now permits the use of WAI-ARIA's role="presentation" inside of
html elements and tables. This allows presentational markup, especially
tables. To be marked up as such.
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 5b64e65..e1caddc 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -258,7 +258,6 @@
'UnlistedSpecialPage' => 'includes/SpecialPage.php',
'UploadSourceAdapter' => 'includes/Import.php',
'UppercaseCollation' => 'includes/Collation.php',
- 'UppercaseSvCollation' => 'includes/Collation.php',
'User' => 'includes/User.php',
'UserArray' => 'includes/UserArray.php',
'UserArrayFromResult' => 'includes/UserArray.php',
diff --git a/includes/Collation.php b/includes/Collation.php
index f57a14a..87afc10 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -43,8 +43,6 @@
switch( $collationName ) {
case 'uppercase':
return new UppercaseCollation;
- case 'uppercase-sv':
- return new UppercaseSvCollation;
case 'identity':
return new IdentityCollation;
case 'uca-default':
@@ -124,22 +122,6 @@
$string = substr( $string, 1 );
}
return $this->lang->ucfirst( $this->lang->firstChar( $string )
);
- }
-}
-
-/**
- * Like UppercaseCollation but swaps Ä and Æ.
- *
- * This provides an ordering suitable for Swedish.
- * @author Lejonel
- */
-class UppercaseSvCollation extends UppercaseCollation {
-
- /* Unicode code point order is ÄÅÆÖ, Swedish order is ÅÄÖ and Æ is
often sorted as Ä.
- * Replacing Ä for Æ should give a better collation. */
- function getSortKey( $string ) {
- $uppercase = $this->lang->uc( $string );
- return strtr( $uppercase, array( 'Ä' => 'Æ', 'Æ' => 'Ä' ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/51025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cd22ad87eb7a56c5742b20c6089a4b8607e5614
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex <matma....@gmail.com>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
