Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/214006
Change subject: Remove i18n shim ...................................................................... Remove i18n shim Change-Id: Ie61097dca1ddcbb1435fcfae5552e2281a30e7c9 (cherry picked from commit 08fc2c940cd5c6b9d0e9d4efae7bf897beda0315) --- D Flow.i18n.php M Flow.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/06/214006/1 diff --git a/Flow.i18n.php b/Flow.i18n.php deleted file mode 100644 index ad8c853..0000000 --- a/Flow.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( 'wfJsonI18nShimb43d2b8567007f2a' ) ) { - function wfJsonI18nShimb43d2b8567007f2a( $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'][] = 'wfJsonI18nShimb43d2b8567007f2a'; -} diff --git a/Flow.php b/Flow.php index e66bd23..48ea2ab 100644 --- a/Flow.php +++ b/Flow.php @@ -78,7 +78,6 @@ require $dir . 'Resources.php'; $wgMessagesDirs['Flow'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['Flow'] = $dir . 'Flow.i18n.php'; $wgExtensionMessagesFiles['FlowNamespaces'] = $dir . '/Flow.namespaces.php'; // This file is autogenerated by scripts/gen-autoload.php -- To view, visit https://gerrit.wikimedia.org/r/214006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie61097dca1ddcbb1435fcfae5552e2281a30e7c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
