From 9c46871d60f02a033c6082836f9b6a18b3a10ec1 Mon Sep 17 00:00:00 2001
From: Pikne <pikne@online.ee>
Date: Tue, 11 Sep 2018 13:30:06 +0000
Subject: [PATCH] Remove xx-uca-et collation workaround

Remove workaround introduced in I3e8031b9. No longer needed.

Bug: T202977
Change-Id: I39921ef83cddc33535b99bd9c0b75f8afb52ea9a
---
 autoload.php                        |  1 -
 includes/collation/Collation.php    |  2 -
 includes/collation/CollationEt.php  | 60 -----------------------------
 includes/collation/IcuCollation.php |  2 +-
 4 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 includes/collation/CollationEt.php

diff --git a/autoload.php b/autoload.php
index dc9461edc7..b52dfb734f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -285,7 +285,6 @@ $wgAutoloadLocalClasses = [
 	'CodeContentHandler' => __DIR__ . '/includes/content/CodeContentHandler.php',
 	'Collation' => __DIR__ . '/includes/collation/Collation.php',
 	'CollationCkb' => __DIR__ . '/includes/collation/CollationCkb.php',
-	'CollationEt' => __DIR__ . '/includes/collation/CollationEt.php',
 	'CommandLineInc' => __DIR__ . '/maintenance/commandLine.inc',
 	'CommandLineInstaller' => __DIR__ . '/maintenance/install.php',
 	'CommentStore' => __DIR__ . '/includes/CommentStore.php',
diff --git a/includes/collation/Collation.php b/includes/collation/Collation.php
index 25b3d94574..ab3c6fb432 100644
--- a/includes/collation/Collation.php
+++ b/includes/collation/Collation.php
@@ -62,8 +62,6 @@ abstract class Collation {
 				return new IcuCollation( 'root-u-kn' );
 			case 'xx-uca-ckb':
 				return new CollationCkb;
-			case 'xx-uca-et':
-				return new CollationEt;
 			case 'uppercase-ab':
 				return new AbkhazUppercaseCollation;
 			case 'uppercase-ba':
diff --git a/includes/collation/CollationEt.php b/includes/collation/CollationEt.php
deleted file mode 100644
index ca7b765314..0000000000
--- a/includes/collation/CollationEt.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- */
-
-/**
- * Workaround for incorrect collation of Estonian language ('et') in ICU (T56168).
- *
- * 'W' and 'V' should not be considered the same letter for the purposes of collation in modern
- * Estonian. We work around this by replacing 'W' and 'w' with 'á´¡' U+1D21 'LATIN LETTER SMALL
- * CAPITAL W' for sortkey generation, which is collated like 'W' and is not tailored to have the
- * same primary weight as 'V' in Estonian.
- *
- * @since 1.24
- */
-class CollationEt extends IcuCollation {
-	public function __construct() {
-		parent::__construct( 'et' );
-	}
-
-	private static function mangle( $string ) {
-		return str_replace(
-			[ 'w', 'W' ],
-			'á´¡', // U+1D21 'LATIN LETTER SMALL CAPITAL W'
-			$string
-		);
-	}
-
-	private static function unmangle( $string ) {
-		// Casing data is lost…
-		return str_replace(
-			'á´¡', // U+1D21 'LATIN LETTER SMALL CAPITAL W'
-			'W',
-			$string
-		);
-	}
-
-	public function getSortKey( $string ) {
-		return parent::getSortKey( self::mangle( $string ) );
-	}
-
-	public function getFirstLetter( $string ) {
-		return self::unmangle( parent::getFirstLetter( self::mangle( $string ) ) );
-	}
-}
diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php
index 7d9f168fb9..ad94d4746d 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -124,7 +124,7 @@ class IcuCollation extends Collation {
 		'en' => [],
 		'eo' => [ "Ĉ", "Ĝ", "Ĥ", "Ĵ", "Ŝ", "Ŭ" ],
 		'es' => [ "Ñ" ],
-		'et' => [ "Š", "Ž", "Õ", "Ä", "Ö", "Ü", "W" ], // added W for CollationEt (xx-uca-et)
+		'et' => [ "Š", "Ž", "Õ", "Ä", "Ö", "Ü" ],
 		'eu' => [ "Ñ" ], // not in libicu
 		'fa' => [
 			// RTL, let's put each letter on a new line
-- 
2.20.1