jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366011 )
Change subject: Remove i18n shim ...................................................................... Remove i18n shim Due to different names in wgMessagesDirs and wgExtensionMessagesFiles the messages were loaded twice Change-Id: I4251de603f77ff3298b07a70e2877a25886b5064 --- D Memento/Memento.i18n.php M Memento/Memento.php 2 files changed, 1 insertion(+), 37 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/Memento/Memento.i18n.php b/Memento/Memento.i18n.php deleted file mode 100644 index ede944d..0000000 --- a/Memento/Memento.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( 'wfJsonI18nShim1b2b6a378e417dee' ) ) { - function wfJsonI18nShim1b2b6a378e417dee( $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'][] = 'wfJsonI18nShim1b2b6a378e417dee'; -} diff --git a/Memento/Memento.php b/Memento/Memento.php index df15436..1ac20e6 100644 --- a/Memento/Memento.php +++ b/Memento/Memento.php @@ -47,8 +47,7 @@ ); // Set up the messages file -$wgMessagesDirs['MementoHeaders'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['Memento'] = __DIR__ . '/Memento.i18n.php'; +$wgMessagesDirs['Memento'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['MementoAlias'] = __DIR__ . '/Memento.alias.php'; // Set up the core classes used by Memento -- To view, visit https://gerrit.wikimedia.org/r/366011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4251de603f77ff3298b07a70e2877a25886b5064 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Memento Gerrit-Branch: master Gerrit-Owner: Umherirrender <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Raimond Spekking <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
