jenkins-bot has submitted this change and it was merged. Change subject: Remove i18n shim ......................................................................
Remove i18n shim Change-Id: I51a1fc5f046cb27c5eb56563f4c3eb426e961dec --- D UserOptionStats.i18n.php M UserOptionStats.php 2 files changed, 1 insertion(+), 39 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/UserOptionStats.i18n.php b/UserOptionStats.i18n.php deleted file mode 100644 index a1136d7..0000000 --- a/UserOptionStats.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( 'wfJsonI18nShim47e6f9b4f4e0d9b2' ) ) { - function wfJsonI18nShim47e6f9b4f4e0d9b2( $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'][] = 'wfJsonI18nShim47e6f9b4f4e0d9b2'; -} diff --git a/UserOptionStats.php b/UserOptionStats.php index 285bb92..a25a1da 100644 --- a/UserOptionStats.php +++ b/UserOptionStats.php @@ -1,6 +1,4 @@ <?php -if ( !defined( 'MEDIAWIKI' ) ) die(); - /** * An useless extension for making pie charts of user options usage. * Requirements: PHPlot and FCFontFinder (for i18n fonts, optional). @@ -26,7 +24,7 @@ $wgExtensionCredits['specialpage'][] = array( 'path' => __FILE__, 'name' => 'User Option Statistics', - 'version' => '1.3.0', + 'version' => '1.3.1', 'author' => 'Niklas Laxström', 'descriptionmsg' => 'useroptionstats-desc', 'url' => 'https://www.mediawiki.org/wiki/Extension:UserOptionStats', @@ -35,6 +33,5 @@ $dir = __DIR__; $wgAutoloadClasses['SpecialUserOptionStats'] = "$dir/SpecialUserOptionStats.php"; $wgMessagesDirs['UserOptionStats'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['UserOptionStats'] = "$dir/UserOptionStats.i18n.php"; $wgExtensionMessagesFiles['UserOptionStatsAlias'] = "$dir/UserOptionStats.alias.php"; $wgSpecialPages['UserOptionStats'] = 'SpecialUserOptionStats'; -- To view, visit https://gerrit.wikimedia.org/r/256950 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51a1fc5f046cb27c5eb56563f4c3eb426e961dec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserOptionStats Gerrit-Branch: master Gerrit-Owner: Nikerabbit <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
