From 81fdbf0af8f5c1514b109f6b763fafdafe7cca7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Thu, 2 Jul 2015 12:05:17 +0200
Subject: [PATCH] Remove i18n shim

Change-Id: Iab92a7f170d1bdbb0caf4047c9f0b38023526820
---
 UniversalLanguageSelector.i18n.php | 35 ------------------------------
 UniversalLanguageSelector.php      |  2 --
 2 files changed, 37 deletions(-)
 delete mode 100644 UniversalLanguageSelector.i18n.php

diff --git a/UniversalLanguageSelector.i18n.php b/UniversalLanguageSelector.i18n.php
deleted file mode 100644
index 12624a9a..00000000
--- a/UniversalLanguageSelector.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim29b26b9f5d64bcef' ) ) {
-	function wfJsonI18nShim29b26b9f5d64bcef( $cache, $code, &$cachedData ) {
-		$codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] );
-		foreach ( $codeSequence as $csCode ) {
-			$fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-			if ( is_readable( $fileName ) ) {
-				$data = FormatJson::decode( file_get_contents( $fileName ), true );
-				foreach ( array_keys( $data ) as $key ) {
-					if ( $key === '' || $key[0] === '@' ) {
-						unset( $data[$key] );
-					}
-				}
-				$cachedData['messages'] = array_merge( $data, $cachedData['messages'] );
-			}
-
-			$cachedData['deps'][] = new FileDependency( $fileName );
-		}
-		return true;
-	}
-
-	$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim29b26b9f5d64bcef';
-}
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 59c64f54..d18c1abf 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -184,8 +184,6 @@ $GLOBALS['wgULSCompactLinks'] = false;
 
 // Internationalization
 $GLOBALS['wgMessagesDirs']['UniversalLanguageSelector'] = __DIR__ . '/i18n';
-$GLOBALS['wgExtensionMessagesFiles']['UniversalLanguageSelector'] =
-	__DIR__ . '/UniversalLanguageSelector.i18n.php';
 
 // Register auto load for the page class
 $GLOBALS['wgAutoloadClasses'] += array(