Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/208499

Change subject: Remove i18n shim
......................................................................

Remove i18n shim

Change-Id: I311ba7bfd23810b821ad29e5c41bb3de4df83f6c
---
D ImageMap.i18n.php
M ImageMap.php
2 files changed, 0 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageMap 
refs/changes/99/208499/1

diff --git a/ImageMap.i18n.php b/ImageMap.i18n.php
deleted file mode 100644
index 4b01ab0..0000000
--- a/ImageMap.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( 'wfJsonI18nShim899c0a5482ee74aa' ) ) {
-       function wfJsonI18nShim899c0a5482ee74aa( $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'][] = 
'wfJsonI18nShim899c0a5482ee74aa';
-}
diff --git a/ImageMap.php b/ImageMap.php
index fb39d4b..c44c9d9 100644
--- a/ImageMap.php
+++ b/ImageMap.php
@@ -20,7 +20,6 @@
 call_user_func( function() {
        $dir = __DIR__ . '/';
        $GLOBALS['wgMessagesDirs']['ImageMap'] = __DIR__ . '/i18n';
-       $GLOBALS['wgExtensionMessagesFiles']['ImageMap'] = $dir . 
'ImageMap.i18n.php';
        $GLOBALS['wgAutoloadClasses']['ImageMap'] = $dir . 'ImageMap_body.php';
        $GLOBALS['wgHooks']['ParserFirstCallInit'][] = 
'ImageMap::onParserFirstCallInit';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/208499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I311ba7bfd23810b821ad29e5c41bb3de4df83f6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMap
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to