Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/216508
Change subject: Remove i18n shim ...................................................................... Remove i18n shim Change-Id: Icade630419e995fb637b00ce0d18819cf003cae7 --- D AjaxLogin.i18n.php M AjaxLogin.php M ApiAjaxLogin.php 3 files changed, 0 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AjaxLogin refs/changes/08/216508/1 diff --git a/AjaxLogin.i18n.php b/AjaxLogin.i18n.php deleted file mode 100644 index 1438c94..0000000 --- a/AjaxLogin.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( 'wfJsonI18nShim4b6c907889858c11' ) ) { - function wfJsonI18nShim4b6c907889858c11( $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'][] = 'wfJsonI18nShim4b6c907889858c11'; -} diff --git a/AjaxLogin.php b/AjaxLogin.php index 9272b62..f999335 100644 --- a/AjaxLogin.php +++ b/AjaxLogin.php @@ -55,7 +55,6 @@ $wgAPIModules['ajaxlogin'] = 'ApiAjaxLogin'; // Internationalization file -$wgExtensionMessagesFiles['AjaxLogin'] = $dir . 'AjaxLogin.i18n.php'; $wgMessagesDirs['AjaxLogin'] = $dir . 'i18n'; // Main PHP class, which contains all the hooked functions diff --git a/ApiAjaxLogin.php b/ApiAjaxLogin.php index 96e80d8..eada585 100644 --- a/ApiAjaxLogin.php +++ b/ApiAjaxLogin.php @@ -166,8 +166,4 @@ 'Token' => null ); } - - public function getVersion() { - return __CLASS__ . ': $Id: ApiAjaxLogin.php 83671 2011-03-10 21:09:49Z ialex $'; - } } -- To view, visit https://gerrit.wikimedia.org/r/216508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icade630419e995fb637b00ce0d18819cf003cae7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AjaxLogin Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
