jenkins-bot has submitted this change and it was merged. Change subject: Remove i18n shim ......................................................................
Remove i18n shim Change-Id: I121eef72a030e0d93dc1fd83744ae60c64f6def0 --- D TorBlock.i18n.php M TorBlock.php 2 files changed, 0 insertions(+), 36 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TorBlock.i18n.php b/TorBlock.i18n.php deleted file mode 100644 index 990d4cd..0000000 --- a/TorBlock.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( 'wfJsonI18nShime8dc6e7a6d9e775f' ) ) { - function wfJsonI18nShime8dc6e7a6d9e775f( $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'][] = 'wfJsonI18nShime8dc6e7a6d9e775f'; -} diff --git a/TorBlock.php b/TorBlock.php index baf46b1..cbf4368 100644 --- a/TorBlock.php +++ b/TorBlock.php @@ -40,7 +40,6 @@ ); $wgMessagesDirs['TorBlock'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['TorBlock'] = __DIR__ . "/TorBlock.i18n.php"; $wgAutoloadClasses['TorBlockHooks'] = __DIR__ . '/includes/TorBlockHooks.php'; $wgAutoloadClasses['TorExitNodes'] = __DIR__ . '/includes/TorExitNodes.php'; -- To view, visit https://gerrit.wikimedia.org/r/231259 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I121eef72a030e0d93dc1fd83744ae60c64f6def0 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/TorBlock Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: Werdna <agarr...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
