jenkins-bot has submitted this change and it was merged. Change subject: Remove i18n shim ......................................................................
Remove i18n shim While at it, update version and remove unnecessary guard check. Change-Id: I6eaafeb5192a0adfb4dd4cf0a57861e7737edd7f --- D TranslationNotifications.i18n.php M TranslationNotifications.php 2 files changed, 1 insertion(+), 42 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslationNotifications.i18n.php b/TranslationNotifications.i18n.php deleted file mode 100644 index 1f9ebe8..0000000 --- a/TranslationNotifications.i18n.php +++ /dev/null @@ -1,36 +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. - */ -// @codingStandardsIgnoreFile -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim01e6b3b220993de8' ) ) { - function wfJsonI18nShim01e6b3b220993de8( $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'][] = 'wfJsonI18nShim01e6b3b220993de8'; -} diff --git a/TranslationNotifications.php b/TranslationNotifications.php index 24ac260..0e221b0 100644 --- a/TranslationNotifications.php +++ b/TranslationNotifications.php @@ -1,7 +1,4 @@ <?php -if ( !defined( 'MEDIAWIKI' ) ) { - die(); -} /** * An extension to keep in touch with translators @@ -12,7 +9,6 @@ * @author Niklas Laxström * @author Amir E. Aharoni * @author Santhosh Thottingal - * @copyright Copyright © 2012, Niklas Laxström * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ @@ -22,7 +18,7 @@ $wgExtensionCredits['specialpage'][] = array( 'path' => __FILE__, 'name' => 'TranslationNotifications', - 'version' => '2014-03-29', + 'version' => '2015-12-04', 'author' => array( 'Niklas Laxström', 'Amir E. Aharoni', @@ -39,7 +35,6 @@ $wgSpecialPages['TranslatorSignup'] = 'SpecialTranslatorSignup'; $wgSpecialPages['NotifyTranslators'] = 'SpecialNotifyTranslators'; $wgMessagesDirs['TranslationNotifications'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['TranslationNotifications'] = "$dir/TranslationNotifications.i18n.php"; $wgExtensionMessagesFiles['TranslationNotificationsAlias'] = "$dir/TranslationNotifications.alias.php"; $wgAutoloadClasses['SpecialTranslatorSignup'] = "$dir/SpecialTranslatorSignup.php"; -- To view, visit https://gerrit.wikimedia.org/r/256947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6eaafeb5192a0adfb4dd4cf0a57861e7737edd7f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TranslationNotifications 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
