Kghbln has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/367648 )
Change subject: Remove I18n php shim and bump version ...................................................................... Remove I18n php shim and bump version Note: This is breaking for MW 1.22.x and earlier. Bug:T168353 Change-Id: I8201f654b0b0f61d459db0714d18bea7ba571ddf --- D MyVariables.i18n.php M MyVariables.php 2 files changed, 1 insertion(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MyVariables refs/changes/48/367648/1 diff --git a/MyVariables.i18n.php b/MyVariables.i18n.php deleted file mode 100644 index 51b03c8..0000000 --- a/MyVariables.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( 'wfJsonI18nShime57c7bed569cdddb' ) ) { - function wfJsonI18nShime57c7bed569cdddb( $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'][] = 'wfJsonI18nShime57c7bed569cdddb'; -} diff --git a/MyVariables.php b/MyVariables.php index 73505be..b6db07b 100644 --- a/MyVariables.php +++ b/MyVariables.php @@ -21,7 +21,7 @@ $wgExtensionCredits['parserhook'][] = array( 'path' => __FILE__, 'name' => 'MyVariables', - 'version' => '3.3.1', + 'version' => '3.4.0', 'url' => 'https://www.mediawiki.org/wiki/Extension:MyVariables', 'author' => array( '[https://www.mediawiki.org/wiki/User:Nad Aran Dunkley]', @@ -34,7 +34,6 @@ // Allow translations for this extension $wgMessagesDirs['MyVariables'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['MyVariables'] = __DIR__ . '/MyVariables.i18n.php'; $wgExtensionMessagesFiles['MyVariablesMagic'] = __DIR__ . '/MyVariables.i18n.magic.php'; // Preparing classes for autoloading -- To view, visit https://gerrit.wikimedia.org/r/367648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8201f654b0b0f61d459db0714d18bea7ba571ddf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MyVariables Gerrit-Branch: master Gerrit-Owner: Kghbln <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
