jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386685 )
Change subject: Remove i18n php shim ...................................................................... Remove i18n php shim The i18n php shim was added to support version 1.22 and older. This extension requires MediaWiki 1.25 Bug: T168353 Change-Id: I0766d85d774dfcb12a31c690bcdc5f4155b97cfa --- D LinkedWiki.i18n.php M extension.json D specialpages/SpecialLinkedWikiConfig.i18n.php M specialpages/SpecialLinkedWikiConfig.php D specialpages/SpecialRDFSave.i18n.php D specialpages/SpecialRDFUnit.i18n.php D specialpages/SpecialSparqlFlintEditor.i18n.php D specialpages/SpecialSparqlQuery.i18n.php 8 files changed, 0 insertions(+), 253 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/LinkedWiki.i18n.php b/LinkedWiki.i18n.php deleted file mode 100644 index 81f8603..0000000 --- a/LinkedWiki.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( 'wfJsonI18nShim59cf31057de0bc97' ) ) { - function wfJsonI18nShim59cf31057de0bc97( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/linkedwiki/$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'][] = 'wfJsonI18nShim59cf31057de0bc97'; -} diff --git a/extension.json b/extension.json index c7068f0..067c3ae 100644 --- a/extension.json +++ b/extension.json @@ -121,14 +121,9 @@ ] }, "ExtensionMessagesFiles": { - "LinkedWiki": "LinkedWiki.i18n.php", - "linkedwiki-specialsparqlquery": "specialpages/SpecialSparqlQuery.i18n.php", "linkedwiki-specialsparqlquery-alias": "specialpages/SpecialSparqlQuery.alias.php", - "linkedwiki-specialsparqlflinteditor": "specialpages/SpecialSparqlFlintEditor.i18n.php", "linkedwiki-specialsparqlflinteditor-alias": "specialpages/SpecialSparqlFlintEditor.alias.php", - "linkedwiki-specialLinkewikiconfig": "specialpages/SpecialLinkedWikiConfig.i18n.php", "linkedwiki-specialLinkewikiconfig-alias": "specialpages/SpecialLinkedWikiConfig.alias.php", - "linkedwiki-specialrdfunit": "specialpages/SpecialRDFUnit.i18n.php", "linkedwiki-specialrdfunit-alias": "specialpages/SpecialRDFUnit.alias.php", "linkedwiki-specialrdfsave-alias": "specialpages/SpecialRDFSave.alias.php" }, diff --git a/specialpages/SpecialLinkedWikiConfig.i18n.php b/specialpages/SpecialLinkedWikiConfig.i18n.php deleted file mode 100644 index 59e5f6b..0000000 --- a/specialpages/SpecialLinkedWikiConfig.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( 'wfJsonI18nShim87f26c5c106e9dd3' ) ) { - function wfJsonI18nShim87f26c5c106e9dd3( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/../i18n/linkedwikiconfig/$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'][] = 'wfJsonI18nShim87f26c5c106e9dd3'; -} diff --git a/specialpages/SpecialLinkedWikiConfig.php b/specialpages/SpecialLinkedWikiConfig.php index d624b23..805e580 100644 --- a/specialpages/SpecialLinkedWikiConfig.php +++ b/specialpages/SpecialLinkedWikiConfig.php @@ -29,8 +29,6 @@ public function __construct() { parent::__construct('linkedwiki-speciallinkedwikiconfig'); - /** @noinspection PhpUndefinedFunctionInspection */ - //wfLoadExtensionMessages('specialsparqlquery'); } function getGroupName() { return 'linkedwiki_group'; diff --git a/specialpages/SpecialRDFSave.i18n.php b/specialpages/SpecialRDFSave.i18n.php deleted file mode 100644 index 492201a..0000000 --- a/specialpages/SpecialRDFSave.i18n.php +++ /dev/null @@ -1,53 +0,0 @@ -<?php -/** - * @copyright (c) 2017 Bourdercloud.com - * @author Karima Rafes <karima.ra...@bordercloud.com> - * @link http://www.mediawiki.org/wiki/Extension:LinkedWiki - * @license CC-by-nc-sa V3.0 - * - * Last version : http://github.com/BorderCloud/LinkedWiki - * - * - * This work is licensed under the Creative Commons - * Attribution-NonCommercial-ShareAlike 3.0 - * Unported License. To view a copy of this license, - * visit http://creativecommons.org/licenses/by-nc-sa/3.0/ - * or send a letter to Creative Commons, - * 171 Second Street, Suite 300, San Francisco, - * California, 94105, USA. - */ - -/** - * 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( 'wfJsonI18nShim87f26c5c106e9dd5' ) ) { - function wfJsonI18nShim87f26c5c106e9dd5( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/../i18n/rdfsave/$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'][] = 'wfJsonI18nShim87f26c5c106e9dd5'; -} diff --git a/specialpages/SpecialRDFUnit.i18n.php b/specialpages/SpecialRDFUnit.i18n.php deleted file mode 100644 index a359394..0000000 --- a/specialpages/SpecialRDFUnit.i18n.php +++ /dev/null @@ -1,53 +0,0 @@ -<?php -/** - * @copyright (c) 2017 Bourdercloud.com - * @author Karima Rafes <karima.ra...@bordercloud.com> - * @link http://www.mediawiki.org/wiki/Extension:LinkedWiki - * @license CC-by-nc-sa V3.0 - * - * Last version : http://github.com/BorderCloud/LinkedWiki - * - * - * This work is licensed under the Creative Commons - * Attribution-NonCommercial-ShareAlike 3.0 - * Unported License. To view a copy of this license, - * visit http://creativecommons.org/licenses/by-nc-sa/3.0/ - * or send a letter to Creative Commons, - * 171 Second Street, Suite 300, San Francisco, - * California, 94105, USA. - */ - -/** - * 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( 'wfJsonI18nShim87f26c5c106e9dd4' ) ) { - function wfJsonI18nShim87f26c5c106e9dd4( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/../i18n/rdfunit/$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'][] = 'wfJsonI18nShim87f26c5c106e9dd4'; -} diff --git a/specialpages/SpecialSparqlFlintEditor.i18n.php b/specialpages/SpecialSparqlFlintEditor.i18n.php deleted file mode 100644 index 5addf17..0000000 --- a/specialpages/SpecialSparqlFlintEditor.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( 'wfJsonI18nShim90b4244003284320' ) ) { - function wfJsonI18nShim90b4244003284320( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/../i18n/sparqlflinteditor/$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'][] = 'wfJsonI18nShim90b4244003284320'; -} diff --git a/specialpages/SpecialSparqlQuery.i18n.php b/specialpages/SpecialSparqlQuery.i18n.php deleted file mode 100644 index 8bfc33f..0000000 --- a/specialpages/SpecialSparqlQuery.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( 'wfJsonI18nShima5d8e45cfbe6df7b' ) ) { - function wfJsonI18nShima5d8e45cfbe6df7b( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/../i18n/sparqlquery/$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'][] = 'wfJsonI18nShima5d8e45cfbe6df7b'; -} -- To view, visit https://gerrit.wikimedia.org/r/386685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0766d85d774dfcb12a31c690bcdc5f4155b97cfa Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/LinkedWiki 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: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
