Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386854 )
Change subject: Remove i18n php shim ...................................................................... Remove i18n php shim The i18n php shim was added to support version 1.22 and older. Bug: T168353 Change-Id: I595d4823327229e5a326f6b4006c9f1ed73882e0 --- D PopcornEditor.i18n.php M PopcornEditor.php 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PopcornEditor refs/changes/54/386854/1 diff --git a/PopcornEditor.i18n.php b/PopcornEditor.i18n.php deleted file mode 100644 index 16aca0a..0000000 --- a/PopcornEditor.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( 'wfJsonI18nShimaa3f47269d281715' ) ) { - function wfJsonI18nShimaa3f47269d281715( $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'][] = 'wfJsonI18nShimaa3f47269d281715'; -} diff --git a/PopcornEditor.php b/PopcornEditor.php index 1c93546..f385ea7 100644 --- a/PopcornEditor.php +++ b/PopcornEditor.php @@ -19,7 +19,6 @@ ); $wgMessagesDirs['PopcornEditor'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['PopcornEditor'] = dirname(__FILE__) . '/PopcornEditor.i18n.php'; $wgHooks['BeforePageDisplay'][] = 'PopcornEditorHooks::beforePageDisplay'; $wgHooks['MakeGlobalVariablesScript'][] = 'PopcornEditorHooks::makeGlobalVariablesScript'; -- To view, visit https://gerrit.wikimedia.org/r/386854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I595d4823327229e5a326f6b4006c9f1ed73882e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PopcornEditor Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits