Jack Phoenix has submitted this change and it was merged. Change subject: Removed old PHP i18n file, no longer needed ......................................................................
Removed old PHP i18n file, no longer needed Change-Id: I53eadddeca00e38d61a7adfd6083ecbbbfdfca0b --- D LinkFilter.i18n.php M LinkFilter.php 2 files changed, 3 insertions(+), 39 deletions(-) Approvals: Jack Phoenix: Verified; Looks good to me, approved diff --git a/LinkFilter.i18n.php b/LinkFilter.i18n.php deleted file mode 100644 index 117c832..0000000 --- a/LinkFilter.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( 'wfJsonI18nShim500b5863a2ea1433' ) ) { - function wfJsonI18nShim500b5863a2ea1433( $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'][] = 'wfJsonI18nShim500b5863a2ea1433'; -} diff --git a/LinkFilter.php b/LinkFilter.php index ed65495..37f365f 100644 --- a/LinkFilter.php +++ b/LinkFilter.php @@ -24,7 +24,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'LinkFilter', - 'version' => '3.1.0', + 'version' => '3.1.1', 'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ), 'descriptionmsg' => 'linkfilter-desc', 'url' => 'https://www.mediawiki.org/wiki/Extension:LinkFilter' @@ -38,7 +38,7 @@ 'linkfilter-admin-accept-success', 'linkfilter-admin-reject-success', 'linkfilter-submit-no-title', 'linkfilter-submit-no-type' ), - 'localBasePath' => dirname( __FILE__ ), + 'localBasePath' => __DIR__, 'remoteExtPath' => 'LinkFilter', 'position' => 'top' // available since r85616 ); @@ -67,11 +67,10 @@ 11 => 'Stupid', ); -$dir = dirname( __FILE__ ); +$dir = __DIR__; // Internationalization files $wgMessagesDirs['LinkFilter'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['LinkFilter'] = "{$dir}/LinkFilter.i18n.php"; $wgExtensionMessagesFiles['LinkFilterAlias'] = "{$dir}/Link.alias.php"; // Namespace translations $wgExtensionMessagesFiles['LinkNamespaces'] = "{$dir}/Link.namespaces.php"; -- To view, visit https://gerrit.wikimedia.org/r/161879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53eadddeca00e38d61a7adfd6083ecbbbfdfca0b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LinkFilter Gerrit-Branch: master Gerrit-Owner: Jack Phoenix <[email protected]> Gerrit-Reviewer: Jack Phoenix <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
