From: MatmaRex <matma.rex@gmail.com>
Date: Tue, 26 Feb 2013 21:13:51 +0000 (+0100)
Subject: Revert "(bug 29788) Swedish Collation (uppercase-sv). Swaps Ä and Æ"
X-Git-Tag: 1.31.0-rc.0~20554
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=0c28ca142245a8993f4409d7adab20c04752ca2a;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 3737932808..cbfafa202b 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -96,8 +96,6 @@ production.
 * (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 5b64e65af9..e1caddc136 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -258,7 +258,6 @@ $wgAutoloadLocalClasses = array(
 	'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 f57a14a274..87afc103a6 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -43,8 +43,6 @@ abstract class Collation {
 		switch( $collationName ) {
 			case 'uppercase':
 				return new UppercaseCollation;
-			case 'uppercase-sv':
-				return new UppercaseSvCollation;
 			case 'identity':
 				return new IdentityCollation;
 			case 'uca-default':
@@ -127,22 +125,6 @@ class UppercaseCollation extends Collation {
 	}
 }
 
-/**
- * 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( 'Ä' => 'Æ', 'Æ' => 'Ä' ) );
-	}
-}
-
 /**
  * Collation class that's essentially a no-op.
  *