jenkins-bot has submitted this change and it was merged. Change subject: Remove legacy localization cruft ......................................................................
Remove legacy localization cruft Change-Id: I53d3aa9c3c7ecbb0626887d8d0c846cea4264640 --- D client/WikibaseClient.i18n.php M client/WikibaseClient.php D lib/WikibaseLib.i18n.php M lib/WikibaseLib.php D repo/Wikibase.i18n.php M repo/Wikibase.php 6 files changed, 3 insertions(+), 99 deletions(-) Approvals: WikidataJenkins: Verified Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/client/WikibaseClient.i18n.php b/client/WikibaseClient.i18n.php deleted file mode 100644 index eeb2776..0000000 --- a/client/WikibaseClient.i18n.php +++ /dev/null @@ -1,31 +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(); -$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; -}; diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php index 6ee4bf5..fca740c 100644 --- a/client/WikibaseClient.php +++ b/client/WikibaseClient.php @@ -45,7 +45,7 @@ call_user_func( function() { global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks; global $wgAPIMetaModules, $wgSpecialPages, $wgSpecialPageGroups, $wgResourceModules; - global $wgWBClientStores, $wgWBClientSettings, $wgRecentChangesFlags; + global $wgWBClientStores, $wgWBClientSettings, $wgRecentChangesFlags, $wgMessagesDirs; $wgExtensionCredits['wikibase'][] = array( @@ -63,7 +63,6 @@ // i18n $wgMessagesDirs['wikibaseclient'] = __DIR__ . '/i18n'; - $wgExtensionMessagesFiles['wikibaseclient'] = $dir . 'WikibaseClient.i18n.php'; $wgExtensionMessagesFiles['Wikibaseclientalias'] = $dir . 'WikibaseClient.i18n.alias.php'; $wgExtensionMessagesFiles['wikibaseclientmagic'] = $dir . 'WikibaseClient.i18n.magic.php'; diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php deleted file mode 100644 index eeb2776..0000000 --- a/lib/WikibaseLib.i18n.php +++ /dev/null @@ -1,31 +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(); -$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; -}; diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php index 081b0ba..4bb76b2 100644 --- a/lib/WikibaseLib.php +++ b/lib/WikibaseLib.php @@ -44,7 +44,7 @@ call_user_func( function() { global $wgExtensionCredits, $wgExtensionMessagesFiles; - global $wgJobClasses, $wgHooks, $wgResourceModules; + global $wgJobClasses, $wgHooks, $wgResourceModules, $wgMessagesDirs; $wgExtensionCredits['wikibase'][] = array( 'path' => __DIR__, @@ -61,7 +61,6 @@ // i18n $wgMessagesDirs['WikibaseLib'] = __DIR__ . '/i18n'; - $wgExtensionMessagesFiles['WikibaseLib'] = __DIR__ . '/WikibaseLib.i18n.php'; $wgJobClasses['ChangeNotification'] = 'Wikibase\ChangeNotificationJob'; diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php deleted file mode 100644 index eeb2776..0000000 --- a/repo/Wikibase.i18n.php +++ /dev/null @@ -1,31 +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(); -$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; -}; diff --git a/repo/Wikibase.php b/repo/Wikibase.php index 58362f9..9f985ef 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -36,7 +36,7 @@ } call_user_func( function() { - global $wgExtensionCredits, $wgGroupPermissions, $wgExtensionMessagesFiles; + global $wgExtensionCredits, $wgGroupPermissions, $wgExtensionMessagesFiles, $wgMessagesDirs; global $wgAPIModules, $wgSpecialPages, $wgSpecialPageGroups, $wgHooks, $wgContentHandlers; global $wgWBStores, $wgWBRepoSettings, $wgResourceModules, $wgValueParsers, $wgJobClasses; @@ -64,7 +64,6 @@ // i18n $wgMessagesDirs['Wikibase'] = __DIR__ . '/i18n'; - $wgExtensionMessagesFiles['Wikibase'] = __DIR__ . '/Wikibase.i18n.php'; $wgExtensionMessagesFiles['WikibaseAlias'] = __DIR__ . '/Wikibase.i18n.alias.php'; $wgExtensionMessagesFiles['WikibaseNS'] = __DIR__ . '/Wikibase.i18n.namespaces.php'; -- To view, visit https://gerrit.wikimedia.org/r/122113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I53d3aa9c3c7ecbb0626887d8d0c846cea4264640 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man <h...@online.de> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
