Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386695 )
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: I1c3f518bb2b2fb38771379c1e3710a256809bf0e --- D Configure.i18n.php M Configure.php D settings/Settings.i18n.php 3 files changed, 0 insertions(+), 72 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure refs/changes/95/386695/1 diff --git a/Configure.i18n.php b/Configure.i18n.php deleted file mode 100644 index 68a089d..0000000 --- a/Configure.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( 'wfJsonI18nShime9860ca6a6108b7e' ) ) { - function wfJsonI18nShime9860ca6a6108b7e( $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'][] = 'wfJsonI18nShime9860ca6a6108b7e'; -} diff --git a/Configure.php b/Configure.php index 9991c99..a765a13 100644 --- a/Configure.php +++ b/Configure.php @@ -208,9 +208,7 @@ # Adding internationalisation... $wgMessagesDirs['Configure'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['Configure'] = $dir . 'Configure.i18n.php'; $wgMessagesDirs['ConfigureSettings'] = $dir . 'settings/i18n'; -$wgExtensionMessagesFiles['ConfigureSettings'] = $dir . 'settings/Settings.i18n.php'; # And special pages aliases... $wgExtensionMessagesFiles['ConfigureAliases'] = $dir . 'Configure.alias.php'; diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php deleted file mode 100644 index 808401b..0000000 --- a/settings/Settings.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( 'wfJsonI18nShim3d3acdb4e585fb0f' ) ) { - function wfJsonI18nShim3d3acdb4e585fb0f( $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'][] = 'wfJsonI18nShim3d3acdb4e585fb0f'; -} -- To view, visit https://gerrit.wikimedia.org/r/386695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c3f518bb2b2fb38771379c1e3710a256809bf0e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure 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
