Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386835 )

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

Remove i18n php shim

The i18n php shim was added to support version 1.22 and older.

Bug: T168353
Change-Id: I6e95ac88ef8e1659b1896cf57f83e2bc7a4b277f
---
D UploadLocal.i18n.php
M UploadLocal.php
2 files changed, 0 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadLocal 
refs/changes/35/386835/1

diff --git a/UploadLocal.i18n.php b/UploadLocal.i18n.php
deleted file mode 100644
index aaf1989..0000000
--- a/UploadLocal.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( 'wfJsonI18nShim9fc379ad634ffda6' ) ) {
-       function wfJsonI18nShim9fc379ad634ffda6( $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'][] = 
'wfJsonI18nShim9fc379ad634ffda6';
-}
diff --git a/UploadLocal.php b/UploadLocal.php
index fcd2c0e..31a3572 100644
--- a/UploadLocal.php
+++ b/UploadLocal.php
@@ -26,7 +26,6 @@
 );
 $wgSpecialPages['UploadLocal'] = 'UploadLocal';
 $wgMessagesDirs['UploadLocal'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['UploadLocal'] = dirname( __FILE__ ) . 
'/UploadLocal.i18n.php';
 $wgExtensionMessagesFiles['UploadLocalAlias'] = dirname( __FILE__ ) . 
'/UploadLocal.alias.php';
 $wgAutoloadClasses[ 'UploadLocal' ] = dirname( __FILE__ ) . 
'/UploadLocal_body.php';
 if( class_exists( 'WebRequestUpload' ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e95ac88ef8e1659b1896cf57f83e2bc7a4b277f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadLocal
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>

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

Reply via email to