jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/387331 )
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: Ib81e922d8dffe6372f1f70c95838f6cc28a358a3 --- D PageNotice.i18n.php M PageNotice.php 2 files changed, 0 insertions(+), 36 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/PageNotice.i18n.php b/PageNotice.i18n.php deleted file mode 100644 index 96d7703..0000000 --- a/PageNotice.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( 'wfJsonI18nShim972fadb61d6da0f3' ) ) { - function wfJsonI18nShim972fadb61d6da0f3( $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'][] = 'wfJsonI18nShim972fadb61d6da0f3'; -} diff --git a/PageNotice.php b/PageNotice.php index 2fcd20a..9a40dad 100644 --- a/PageNotice.php +++ b/PageNotice.php @@ -34,7 +34,6 @@ $dir = __DIR__; $wgAutoloadClasses['PageNoticeHooks'] = $dir . '/PageNotice.hooks.php'; -$wgExtensionMessagesFiles['PageNotice'] = $dir . '/PageNotice.i18n.php'; $wgMessagesDirs['PageNotice'] = __DIR__ . '/i18n'; $wgHooks['ArticleViewHeader'][] = 'PageNoticeHooks::renderHeader'; $wgHooks['ArticleViewFooter'][] = 'PageNoticeHooks::renderFooter'; -- To view, visit https://gerrit.wikimedia.org/r/387331 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib81e922d8dffe6372f1f70c95838f6cc28a358a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageNotice 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
