jenkins-bot has submitted this change and it was merged. Change subject: Remove i18n shim ......................................................................
Remove i18n shim Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62 --- D UserMerge.i18n.php M UserMerge.php 2 files changed, 0 insertions(+), 36 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php deleted file mode 100644 index 841f856..0000000 --- a/UserMerge.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( 'wfJsonI18nShim12288ddd27589de3' ) ) { - function wfJsonI18nShim12288ddd27589de3( $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'][] = 'wfJsonI18nShim12288ddd27589de3'; -} diff --git a/UserMerge.php b/UserMerge.php index cdf9282..4fee3e3 100644 --- a/UserMerge.php +++ b/UserMerge.php @@ -67,7 +67,6 @@ $wgHooks['UnitTestsList'][] = 'UserMergeHooks::onUnitTestsList'; $wgMessagesDirs['UserMerge'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php'; $wgExtensionMessagesFiles['UserMergeAlias'] = $dir . 'UserMerge.alias.php'; $wgSpecialPages['UserMerge'] = 'UserMerge'; -- To view, visit https://gerrit.wikimedia.org/r/214096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UserMerge Gerrit-Branch: master Gerrit-Owner: Paladox <[email protected]> Gerrit-Reviewer: Legoktm <[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
