Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/295584
Change subject: Removed i18n shim ...................................................................... Removed i18n shim Supports mw 1.23+ now. Change-Id: I0cce53f5b9486b3538fe66eb4f83966a238faf9a --- D EventLogging.i18n.php M EventLogging.php D includes/JsonSchema.i18n.php 3 files changed, 0 insertions(+), 72 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging refs/changes/84/295584/1 diff --git a/EventLogging.i18n.php b/EventLogging.i18n.php deleted file mode 100644 index 0c264f9..0000000 --- a/EventLogging.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 = []; -if ( !function_exists( 'wfJsonI18nShim58963441fa6d0066' ) ) { - function wfJsonI18nShim58963441fa6d0066( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/i18n/core/$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'][] = 'wfJsonI18nShim58963441fa6d0066'; -} diff --git a/EventLogging.php b/EventLogging.php index 37b8e47..f51699d 100644 --- a/EventLogging.php +++ b/EventLogging.php @@ -156,9 +156,7 @@ $wgMessagesDirs['EventLogging'] = __DIR__ . '/i18n/core'; $wgMessagesDirs['JsonSchema'] = __DIR__ . '/i18n/jsonschema'; $wgExtensionMessagesFiles += [ - 'EventLogging' => __DIR__ . '/EventLogging.i18n.php', 'EventLoggingNamespaces' => __DIR__ . '/EventLogging.namespaces.php', - 'JsonSchema' => __DIR__ . '/includes/JsonSchema.i18n.php', ]; // Modules diff --git a/includes/JsonSchema.i18n.php b/includes/JsonSchema.i18n.php deleted file mode 100644 index 464d678..0000000 --- a/includes/JsonSchema.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 = []; -if ( !function_exists( 'wfJsonI18nShim081e52cd9a576eeb0' ) ) { - function wfJsonI18nShim081e52cd9a576eeb0( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( [ $code ], $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/../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'][] = 'wfJsonI18nShim081e52cd9a576eeb0'; -} -- To view, visit https://gerrit.wikimedia.org/r/295584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cce53f5b9486b3538fe66eb4f83966a238faf9a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
