jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/387248 )
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: I1c0c3964542d332608ec03b95c0a52a6b3715f3e --- D Interlanguage.i18n.php M Interlanguage.php D InterlanguageCentral.i18n.php M InterlanguageCentral.php 4 files changed, 0 insertions(+), 72 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Interlanguage.i18n.php b/Interlanguage.i18n.php deleted file mode 100644 index 0be6050..0000000 --- a/Interlanguage.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( 'wfJsonI18nShim4c09fa90b6e66b02' ) ) { - function wfJsonI18nShim4c09fa90b6e66b02( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/interlanguage/$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'][] = 'wfJsonI18nShim4c09fa90b6e66b02'; -} diff --git a/Interlanguage.php b/Interlanguage.php index f15e1a9..06c000d 100644 --- a/Interlanguage.php +++ b/Interlanguage.php @@ -38,7 +38,6 @@ ); $wgMessagesDirs['Interlanguage'] = __DIR__ . '/i18n/interlanguage'; -$wgExtensionMessagesFiles['Interlanguage'] = dirname(__FILE__) . '/Interlanguage.i18n.php'; $wgExtensionMessagesFiles['InterlanguageMagic'] = dirname(__FILE__) . '/Interlanguage.i18n.magic.php'; $wgAutoloadClasses['InterlanguageExtension'] = dirname(__FILE__) . '/InterlanguageExtension.php'; $wgHooks['ParserFirstCallInit'][] = 'wfInterlanguageExtension'; diff --git a/InterlanguageCentral.i18n.php b/InterlanguageCentral.i18n.php deleted file mode 100644 index 7a3b27a..0000000 --- a/InterlanguageCentral.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( 'wfJsonI18nShim0cfb63709eabef49' ) ) { - function wfJsonI18nShim0cfb63709eabef49( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/central/$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'][] = 'wfJsonI18nShim0cfb63709eabef49'; -} diff --git a/InterlanguageCentral.php b/InterlanguageCentral.php index 38f21e2..d5bb851 100644 --- a/InterlanguageCentral.php +++ b/InterlanguageCentral.php @@ -35,7 +35,6 @@ ); $wgMessagesDirs['InterlanguageCentral'] = __DIR__ . '/i18n/central'; -$wgExtensionMessagesFiles['InterlanguageCentral'] = dirname(__FILE__) . '/InterlanguageCentral.i18n.php'; $wgExtensionMessagesFiles['InterlanguageCentralMagic'] = dirname(__FILE__) . '/InterlanguageCentral.i18n.magic.php'; $wgAutoloadClasses['InterlanguageCentralExtensionPurgeJob'] = dirname(__FILE__) . '/InterlanguageCentralExtensionPurgeJob.php'; $wgAutoloadClasses['InterlanguageCentralExtension'] = dirname(__FILE__) . '/InterlanguageCentralExtension.php'; -- To view, visit https://gerrit.wikimedia.org/r/387248 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c0c3964542d332608ec03b95c0a52a6b3715f3e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Interlanguage Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
