Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/214096
Change subject: Remove i18n shim ...................................................................... Remove i18n shim Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62 --- D UserMerge.i18n.php M UserMerge.php M i18n/ksh.json 3 files changed, 2 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge refs/changes/96/214096/1 diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php deleted file mode 100644 index 841f856..0000000 --- a/UserMerge.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( 'wfJsonI18nShim12288ddd27589de3' ) ) { - function wfJsonI18nShim12288ddd27589de3( $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'][] = 'wfJsonI18nShim12288ddd27589de3'; -} diff --git a/UserMerge.php b/UserMerge.php index cdf9282..4fee3e3 100644 --- a/UserMerge.php +++ b/UserMerge.php @@ -67,7 +67,6 @@ $wgHooks['UnitTestsList'][] = 'UserMergeHooks::onUnitTestsList'; $wgMessagesDirs['UserMerge'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php'; $wgExtensionMessagesFiles['UserMergeAlias'] = $dir . 'UserMerge.alias.php'; $wgSpecialPages['UserMerge'] = 'UserMerge'; diff --git a/i18n/ksh.json b/i18n/ksh.json index 7015849..9683125 100644 --- a/i18n/ksh.json +++ b/i18n/ksh.json @@ -21,8 +21,8 @@ "usermerge-userdeleted-log": "Fott jeschmeße Metmaacherame: „$2“ ($3)", "usermerge-success": "Et Zosammelääje {{GENDER:$1|vum|vum|vumm Metmaacher|vun dä|vum}} „$1“ ($2) {{GENDER:$3|mem|mem|med dämm Metmaacher|met dä|mem}} „$3“ {{GENDER:$3|nohm|nohm|nohm|noh dä|nohm}} „$3“ ($4) es komplätt.", "usermerge-success-log": "{{GENDER:$2|Dä Metmaacher|De Metmaacherėn|Dä Metmaacher|De Metmaacherėn|Dä Metmaacher}} mem Nahme „$2“ ($3) es zosammejelaat met {{GENDER:$4|däm Metmaacher|dä Metmaacherėn|däm Metmaacher|dä Metmaacherėn|däm Metmaacher}} mem Name „$4“ ($5)", - "usermerge-logpage": "Logboch övver et Metmaacher-Zosammelääje", - "usermerge-logpagetext": "Dat hee es et Logboch övver de zosammejelaate Metmaachere.", + "usermerge-logpage": "Logbohch övver et Metmaacher_Zosammelähje", + "usermerge-logpagetext": "Dat heh es et Logbohch övver de zosammejelaate Metmaachere.", "usermerge-noselfdelete": "Ene Metmaacher met sesch sellver zosamme ze lääje, wat ene Quatsch! Dat jeiht nit.{{GENDER:$1|}}", "usermerge-protectedgroup": "Schadt. Di esu zosamme ze lähje es nit müjjelesch. {{GENDER:$1|Dä Metmaacher|De Metmaacherėn|Dä Metmaacher|De Metmaacherėn|Dä Metmaacher}} „$1“ es en en Jropp, die et Zosammelähje verbehdt.", "right-usermerge": "Metmaacher zosammelääje", -- To view, visit https://gerrit.wikimedia.org/r/214096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4eff75f7181db55a10a9ebf3e12e6a3ce8b3d62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserMerge 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
