jenkins-bot has submitted this change and it was merged. Change subject: Remove i18n shim ......................................................................
Remove i18n shim Change-Id: I9aceef32012ce918c0d9b11b19a4b1be0744cd44 (cherry picked from commit a034c486af698822f94791aa7dbf3949563d54de) --- D TemplateSandbox.i18n.php M TemplateSandbox.php M extension.json 3 files changed, 0 insertions(+), 37 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TemplateSandbox.i18n.php b/TemplateSandbox.i18n.php deleted file mode 100644 index cf000f8..0000000 --- a/TemplateSandbox.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( 'wfJsonI18nShim21ca22783d54cf63' ) ) { - function wfJsonI18nShim21ca22783d54cf63( $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'][] = 'wfJsonI18nShim21ca22783d54cf63'; -} diff --git a/TemplateSandbox.php b/TemplateSandbox.php index 84f1812..e1d1e95 100644 --- a/TemplateSandbox.php +++ b/TemplateSandbox.php @@ -56,7 +56,6 @@ $wgAutoloadClasses['TemplateSandboxHooks'] = __DIR__ . '/TemplateSandbox.hooks.php'; $wgAutoloadClasses['SpecialTemplateSandbox'] = __DIR__ . '/SpecialTemplateSandbox.php'; $wgMessagesDirs['TemplateSandbox'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['TemplateSandbox'] = __DIR__ . '/TemplateSandbox.i18n.php'; $wgExtensionMessagesFiles['TemplateSandboxAlias'] = __DIR__ . '/TemplateSandbox.alias.php'; $wgSpecialPages['TemplateSandbox'] = 'SpecialTemplateSandbox'; $wgSpecialPageGroups['TemplateSandbox'] = 'wiki'; diff --git a/extension.json b/extension.json index 23eea0f..4925ece 100644 --- a/extension.json +++ b/extension.json @@ -18,7 +18,6 @@ ] }, "ExtensionMessagesFiles": { - "TemplateSandbox": "TemplateSandbox.i18n.php", "TemplateSandboxAlias": "TemplateSandbox.alias.php" }, "AutoloadClasses": { -- To view, visit https://gerrit.wikimedia.org/r/214003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aceef32012ce918c0d9b11b19a4b1be0744cd44 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/TemplateSandbox Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> 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
