Kghbln has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/369526 )
Change subject: Remove I18n php shim and bump version ...................................................................... Remove I18n php shim and bump version Note: This is breaking for MW 1.22.x and earlier. Bug:T168353 Change-Id: Id766f034b7d6ce8a17685ff795fc67d45428bf38 --- M INSTALL M RELEASE-NOTES D SemanticImageInput.i18n.php M SemanticImageInput.php 4 files changed, 28 insertions(+), 49 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticImageInput refs/changes/26/369526/1 diff --git a/INSTALL b/INSTALL index afed7c2..92b9030 100644 --- a/INSTALL +++ b/INSTALL @@ -8,7 +8,7 @@ Semantic Image Input requires: -* MediaWiki 1.17 or above +* MediaWiki 1.23 or above * Semantic Forms 2.2 or above * PHP 5.3 or above diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 9390a56..c6b1951 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,19 +1,33 @@ -These are the release notes for the Semantic Image Input extension. - -Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Semantic_Image_Input -Latest version of the release notes: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticImageInput/RELEASE-NOTES?view=co +These are the release notes for the Semantic Image Input extension. See also +the extension's page on mediawiki.org: +* https://www.mediawiki.org/wiki/Extension:Semantic_Image_Input -=== Version 0.2 === -201x-xx-xx +== Version 0.4.0 == +Released on 2017-08-01 + +* Removed I18n php shim + +== Version 0.3.0 == +Released on 2014-04-01 + +* Migrated to JSON i18n + +== Version 0.2.0 == +Release on 2011-12-13 * Fixed some Internet Explorer specific JavaScript issues. +* Fixed title of Special page does not contain "subpages" +* Fixed anon functions not available in php pre5.3 +* Fixed width attrib of html elements must not contain unit (px) +* Fixed width of wikitext image link must contain unit (px) +* Tweaked jquery -=== Version 0.1 === -2011-11-10 +== Version 0.1.0 == +Released on 2011-11-10 Initial release with these features: * Image input that automatically fetches the first image from a Wikipedia page. * Wikipedia redirect resolving. -* Support for multiple instance templates in forms. \ No newline at end of file +* Support for multiple instance templates in forms. diff --git a/SemanticImageInput.i18n.php b/SemanticImageInput.i18n.php deleted file mode 100644 index 8c301b8..0000000 --- a/SemanticImageInput.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * This is a backwards-compatibility shim, generated by: - * https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.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( 'wfJsonI18nShimcc13f2f0da3fd726' ) ) { - function wfJsonI18nShimcc13f2f0da3fd726( $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'][] = 'wfJsonI18nShimcc13f2f0da3fd726'; -} diff --git a/SemanticImageInput.php b/SemanticImageInput.php index c21876a..1e573ed 100644 --- a/SemanticImageInput.php +++ b/SemanticImageInput.php @@ -19,8 +19,8 @@ die( 'Not an entry point.' ); } -if ( version_compare( $wgVersion, '1.17c', '<' ) ) { // Needs to be 1.17c because version_compare() works in confusing ways - die( '<b>Error:</b> Semantic Image Input requires MediaWiki 1.17 or above.' ); +if ( version_compare( $wgVersion, '1.23c', '<' ) ) { // Needs to be 1.23c because version_compare() works in confusing ways + die( '<b>Error:</b> Semantic Image Input requires MediaWiki 1.23 or above.' ); } // Show an error if Semantic MediaWiki is not loaded. @@ -33,7 +33,7 @@ die( '<b>Error:</b> You need to have <a href="https://www.mediawiki.org/wiki/Extension:Semantic_Forms";>Semantic Forms</a> installed in order to use Semantic Image Input.<br />' ); } -define( 'SII_VERSION', '0.3.0 alpha' ); +define( 'SII_VERSION', '0.4.0' ); $wgExtensionCredits['semantic'][] = array( 'path' => __FILE__, @@ -41,6 +41,7 @@ 'version' => SII_VERSION, 'author' => array( '[https://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', + '...' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:Semantic_Image_input', 'descriptionmsg' => 'sii-desc', @@ -49,7 +50,6 @@ // i18n $wgMessagesDirs['SemanticImageInput'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['SemanticImageInput'] = __DIR__ . '/SemanticImageInput.i18n.php'; // Autoloading $wgAutoloadClasses['SIISettings'] = __DIR__ . '/SemanticImageInput.settings.php'; -- To view, visit https://gerrit.wikimedia.org/r/369526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id766f034b7d6ce8a17685ff795fc67d45428bf38 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticImageInput Gerrit-Branch: master Gerrit-Owner: Kghbln <mediaw...@kghoffmeyer.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
