Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/225038
Change subject: Remove i18n shim ...................................................................... Remove i18n shim Change-Id: I1ec47be0939d1f143e21f790f49bd6cb2c60248b --- D Farmer.i18n.php M Farmer.php 2 files changed, 5 insertions(+), 43 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Farmer refs/changes/38/225038/1 diff --git a/Farmer.i18n.php b/Farmer.i18n.php deleted file mode 100644 index fa8e099..0000000 --- a/Farmer.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( 'wfJsonI18nShim0de8654742d79d30' ) ) { - function wfJsonI18nShim0de8654742d79d30( $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'][] = 'wfJsonI18nShim0de8654742d79d30'; -} diff --git a/Farmer.php b/Farmer.php index 4e87c66..657306d 100644 --- a/Farmer.php +++ b/Farmer.php @@ -73,17 +73,14 @@ 'defaultSkin' => 'vector', ); -$root = dirname( __FILE__ ) . '/'; - $wgMessagesDirs['MediaWikiFarmer'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['MediaWikiFarmer'] = __DIR__ . 'Farmer.i18n.php'; -$wgExtensionMessagesFiles['MediaWikiFarmerAlias'] = $root . 'Farmer.alias.php'; +$wgExtensionMessagesFiles['MediaWikiFarmerAlias'] = __DIR__ . '/Farmer.alias.php'; -$wgAutoloadClasses['MediaWikiFarmer'] = $root . 'MediaWikiFarmer.php'; -$wgAutoloadClasses['MediaWikiFarmer_Extension'] = $root . 'MediaWikiFarmer_Extension.php'; -$wgAutoloadClasses['MediaWikiFarmer_Wiki'] = $root . 'MediaWikiFarmer_Wiki.php'; -$wgAutoloadClasses['SpecialFarmer'] = $root . 'SpecialFarmer.php'; +$wgAutoloadClasses['MediaWikiFarmer'] = __DIR__ . '/MediaWikiFarmer.php'; +$wgAutoloadClasses['MediaWikiFarmer_Extension'] = __DIR__ . '/MediaWikiFarmer_Extension.php'; +$wgAutoloadClasses['MediaWikiFarmer_Wiki'] = __DIR__ . '/MediaWikiFarmer_Wiki.php'; +$wgAutoloadClasses['SpecialFarmer'] = __DIR__ . '/SpecialFarmer.php'; $wgSpecialPages['Farmer'] = 'SpecialFarmer'; -- To view, visit https://gerrit.wikimedia.org/r/225038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ec47be0939d1f143e21f790f49bd6cb2c60248b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Farmer Gerrit-Branch: master Gerrit-Owner: Paladox <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
