Kghbln has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365556 )
Change subject: Remove I18n shim Bump version ...................................................................... Remove I18n shim Bump version Note: Breaks compatibility with MediaWiki 1.22.x and lower Bug:T168353 Change-Id: I046a7db0bb25cbef5ee0c179b3ffb1398fb9bac3 --- D Arrays.i18n.php M Arrays.php 2 files changed, 4 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Arrays refs/changes/56/365556/1 diff --git a/Arrays.i18n.php b/Arrays.i18n.php deleted file mode 100644 index 0106efb..0000000 --- a/Arrays.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( 'wfJsonI18nShim0d00d0d3c8390a97' ) ) { - function wfJsonI18nShim0d00d0d3c8390a97( $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'][] = 'wfJsonI18nShim0d00d0d3c8390a97'; -} diff --git a/Arrays.php b/Arrays.php index 4465da4..fc9e7df 100644 --- a/Arrays.php +++ b/Arrays.php @@ -5,13 +5,13 @@ * * Documentation: https://www.mediawiki.org/wiki/Extension:Arrays * Support: https://www.mediawiki.org/wiki/Extension_talk:Arrays - * Source code: https://git.wikimedia.org/summary/mediawiki%2Fextensions%2FArrays + * Source code: https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Arrays * * @file * @ingroup Arrays * * @licence MIT License - * @version: 2.0rc3 alpha + * @version: 2.1.0 * * @author Li Ding < liding...@gmail.com > * @author Jie Bao @@ -34,8 +34,8 @@ 'version' => ExtArrays::VERSION ); +// Internationalization $wgMessagesDirs['Arrays'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['Arrays' ] = ExtArrays::getDir() . '/Arrays.i18n.php'; $wgExtensionMessagesFiles['ArraysMagic'] = ExtArrays::getDir() . '/Arrays.i18n.magic.php'; // hooks registration: @@ -63,7 +63,7 @@ * * @since 2.0 (before in 'Arrays' class since 1.3.2) */ - const VERSION = '2.0rc3 alpha'; + const VERSION = '2.1.0'; /** * Store for arrays. -- To view, visit https://gerrit.wikimedia.org/r/365556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I046a7db0bb25cbef5ee0c179b3ffb1398fb9bac3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Arrays Gerrit-Branch: master Gerrit-Owner: Kghbln <mediaw...@kghoffmeyer.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
