jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/387448 )
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: I0974e102ea8f6e20b3ede7dee1f314f46733685a --- M PageForms.php D languages/PF_Messages.php 2 files changed, 0 insertions(+), 32 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/PageForms.php b/PageForms.php index ab3aa41..9a2b9f2 100644 --- a/PageForms.php +++ b/PageForms.php @@ -234,7 +234,6 @@ $GLOBALS['wgAutoloadClasses']['PFCreatePageJob'] = __DIR__ . '/includes/PF_CreatePageJob.php'; $GLOBALS['wgMessagesDirs']['PageForms'] = __DIR__ . '/i18n'; -$GLOBALS['wgExtensionMessagesFiles']['PageForms'] = __DIR__ . '/languages/PF_Messages.php'; $GLOBALS['wgExtensionMessagesFiles']['PageFormsAlias'] = __DIR__ . '/languages/PF_Aliases.php'; $GLOBALS['wgExtensionMessagesFiles']['PageFormsMagic'] = __DIR__ . '/languages/PF_Magic.php'; $GLOBALS['wgExtensionMessagesFiles']['PageFormsNS'] = __DIR__ . '/languages/PF_Namespaces.php'; diff --git a/languages/PF_Messages.php b/languages/PF_Messages.php deleted file mode 100644 index 85420f1..0000000 --- a/languages/PF_Messages.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -/** - * This is a backwards-compatibility shim, generated by: - * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.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(); -$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = __DIR__ . "/../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; -}; -- To view, visit https://gerrit.wikimedia.org/r/387448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0974e102ea8f6e20b3ede7dee1f314f46733685a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms 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
