From: jhsoby <jhsoby@gmail.com>
Date: Mon, 6 Aug 2018 23:20:14 +0000 (+0200)
Subject: Remove special collation for Northern Sami
X-Git-Tag: 1.34.0-rc.0~4520^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=3469713f4e36f9fb7e9babe0f2fd165d6e59b2e2;p=lhc%2Fweb%2Fwiklou.git

Remove special collation for Northern Sami

This removes the special collation for Northern Sami
that was added in 396007, when UCA support for Northern
Sami was not yet in MediaWiki. Now it is, so this
is no longer needed.

Bug: T182431
Change-Id: I760eb7ae8bf92f0ac93b5fca5cb69148a28d8f6f
---

diff --git a/autoload.php b/autoload.php
index 38f6ba9cd8..e02a743a10 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1012,7 +1012,6 @@ $wgAutoloadLocalClasses = [
 	'NewUsersLogFormatter' => __DIR__ . '/includes/logging/NewUsersLogFormatter.php',
 	'NoWriteWatchedItemStore' => __DIR__ . '/includes/watcheditem/NoWriteWatchedItemStore.php',
 	'NolinesImageGallery' => __DIR__ . '/includes/gallery/NolinesImageGallery.php',
-	'NorthernSamiUppercaseCollation' => __DIR__ . '/includes/collation/NorthernSamiUppercaseCollation.php',
 	'NotRecursiveIterator' => __DIR__ . '/includes/libs/iterators/NotRecursiveIterator.php',
 	'NukeNS' => __DIR__ . '/maintenance/nukeNS.php',
 	'NukePage' => __DIR__ . '/maintenance/nukePage.php',
diff --git a/includes/collation/Collation.php b/includes/collation/Collation.php
index f52dcae017..b1ccdc20a3 100644
--- a/includes/collation/Collation.php
+++ b/includes/collation/Collation.php
@@ -67,8 +67,6 @@ abstract class Collation {
 				return new AbkhazUppercaseCollation;
 			case 'uppercase-ba':
 				return new BashkirUppercaseCollation;
-			case 'uppercase-se':
-				return new NorthernSamiUppercaseCollation;
 			default:
 				$match = [];
 				if ( preg_match( '/^uca-([A-Za-z@=-]+)$/', $collationName, $match ) ) {
diff --git a/includes/collation/NorthernSamiUppercaseCollation.php b/includes/collation/NorthernSamiUppercaseCollation.php
deleted file mode 100644
index d373749e54..0000000000
--- a/includes/collation/NorthernSamiUppercaseCollation.php
+++ /dev/null
@@ -1,83 +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
- *
- * @since 1.31
- *
- * @file
- */
-
-/**
- * Temporary workaround for incorrect collation of Northern Sami
- * language ('se') in Wikimedia servers (see bug T181503).
- *
- * When the ICU's 'se' collation has been included in PHP-intl and Wikimedia
- * servers updated to that new version of PHP, this file should be deleted
- * and the collation for 'se' set to 'uca-se'.
- *
- * @since 1.31
- */
-
-class NorthernSamiUppercaseCollation extends CustomUppercaseCollation {
-
-	public function __construct() {
-		parent::__construct( [
-			'A',
-			'Á',
-			'B',
-			'C',
-			'Č',
-			'Æ·', // Not part of modern alphabet, but part of ICU
-			'Ç®', // Not part of modern alphabet, but part of ICU
-			'D',
-			'Đ',
-			'E',
-			'F',
-			'G',
-			'Ǧ', // Not part of modern alphabet, but part of ICU
-			'Ǥ', // Not part of modern alphabet, but part of ICU
-			'H',
-			'I',
-			'J',
-			'K',
-			'Ǩ', // Not part of modern alphabet, but part of ICU
-			'L',
-			'M',
-			'N',
-			'Ŋ',
-			'O',
-			'P',
-			'Q',
-			'R',
-			'S',
-			'Å ',
-			'T',
-			'Ŧ',
-			'U',
-			'V',
-			'W',
-			'X',
-			'Y',
-			'Z',
-			'Ž',
-			'Ø', // Not part of native alphabet, but part of ICU
-			'Æ', // Not part of native alphabet, but part of ICU
-			'Å', // Not part of native alphabet, but part of ICU
-			'Ä', // Not part of native alphabet, but part of ICU
-			'Ö', // Not part of native alphabet, but part of ICU
-		], Language::factory( 'se' ) );
-	}
-}