jenkins-bot has submitted this change and it was merged.

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


Remove i18n shim

Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
(cherry picked from commit 8cc075ea1e43f39249141c93137b3792901cc88a)
---
D CharInsert.i18n.php
M extension.json
2 files changed, 0 insertions(+), 38 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CharInsert.i18n.php b/CharInsert.i18n.php
deleted file mode 100644
index 8fd8dc0..0000000
--- a/CharInsert.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( 'wfJsonI18nShime4fc00e265fc0f96' ) ) {
-       function wfJsonI18nShime4fc00e265fc0f96( $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'][] = 
'wfJsonI18nShime4fc00e265fc0f96';
-}
diff --git a/extension.json b/extension.json
index 6ef8475..8933dc0 100644
--- a/extension.json
+++ b/extension.json
@@ -4,9 +4,6 @@
        "url": "https://www.mediawiki.org/wiki/Extension:CharInsert";,
        "descriptionmsg": "charinsert-desc",
        "type": "parserhook",
-       "ExtensionMessagesFiles": {
-               "CharInsert": "CharInsert.i18n.php"
-       },
        "Hooks": {
                "ParserFirstCallInit": [
                        "CharInsert::onParserFirstCallInit"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to