From: Brian Wolff <bawolff+wn@gmail.com>
Date: Tue, 15 Jan 2013 21:09:46 +0000 (-0400)
Subject: (bug 29788) Swedish Collation (uppercase-sv). Swaps Ä and Æ
X-Git-Tag: 1.31.0-rc.0~20792
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=13dc8ff88f48e0bb18750f5e98d50cdb8057c0d3;p=lhc%2Fweb%2Fwiklou.git

(bug 29788) Swedish Collation (uppercase-sv). Swaps Ä and Æ

See I4542f57a. Meant as a temporary meassure until such a time
generic tailoring code is implemented for uca. This patch
is mostly Lejonel's code, with the class renamed.

Change-Id: Id39406c37a5277d9e7a9216544de2140411c2b01
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index c735271391..99ac1ec74c 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -89,6 +89,8 @@ 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.
 
 === Bug fixes in 1.21 ===
 * (bug 40353) SpecialDoubleRedirect should support interwiki redirects.
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index be642e89fb..cb39b733b7 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -256,6 +256,7 @@ $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 f53ce02c66..7c2c05ed0a 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -43,6 +43,8 @@ abstract class Collation {
 		switch( $collationName ) {
 			case 'uppercase':
 				return new UppercaseCollation;
+			case 'uppercase-sv':
+				return new UppercaseSvCollation;
 			case 'identity':
 				return new IdentityCollation;
 			case 'uca-default':
@@ -121,6 +123,22 @@ 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.
  *