Jeroen De Dauw has submitted this change and it was merged. Change subject: Provide several tweaks ......................................................................
Provide several tweaks * Updated INSTALL file * Updated README file * Formatted COPYING file * Provide license label to show on "Special:Version" * Go https * Do linkfixes * Minor formatting of SemanticImageInput.php * Consistently switch to use __DIR__ Bug: T123943 Change-Id: I98f57637e74e7d7e2a4ef133a09dcfd353502e19 --- M COPYING M INSTALL M README M SemanticImageInput.php 4 files changed, 32 insertions(+), 30 deletions(-) Approvals: Jeroen De Dauw: Looks good to me, approved jenkins-bot: Verified diff --git a/COPYING b/COPYING index f583e2f..2677105 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,9 @@ -The license text below "----" applies to all files within this distribution, other -than those that are in a directory which contains files named "LICENSE" or -"COPYING", or a subdirectory thereof. For those files, the license text contained in -said file overrides any license information contained in directories of smaller depth. -Alternative licenses are typically used for software that is provided by external +The license text below "----" applies to all files within this +distribution, other than those that are in a directory which contains +files named "LICENSE" or "COPYING", or a subdirectory thereof. For those +files, the license text contained in said file overrides any license +information contained in directories of smaller depth. Alternative +licenses are typically used for software that is provided by external parties, and merely packaged with this software for convenience. ---- @@ -679,4 +680,4 @@ may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. \ No newline at end of file +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/INSTALL b/INSTALL index 2bce5cb..43a2be5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ These is the install file for the Semantic Image Input extension. Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Semantic_Image_Input -Latest version of the install file: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticImageInput/INSTALL?view=co +Latest version of the install file: https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FSemanticImageInput.git/master/INSTALL == Requirements == @@ -14,25 +14,27 @@ == Download == -You can get the code directly from SVN. Tags can be obtained via +You can get the code directly from Git. - svn checkout <nowiki>http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/SemanticImageInput/REL_version</nowiki> + cd /path/to/extensions + git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticImageInput.git -Where 'version' is the version number of the tag, such as 0_1 (see the [http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/SemanticImageInput/ available tags]). -The latest code can be obtained from trunk: +Tags can be viewed like - svn checkout <nowiki>http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/SemanticImageInput/</nowiki> + cd /SemanticImageInput + git tag -l + git checkout <tag name> == Installation == Once you have downloaded the code, place the ''SemanticImageInput'' directory within your MediaWiki -'extensions' directory. Then add the following code to your [[Manual:LocalSettings.php|LocalSettings.php]] file: +'extensions' directory. Then add the following code to your "LocalSettings.php" file: # Semantic Image Input -require_once( "$IP/extensions/SemanticImageInput/SemanticImageInput.php" ); +require_once "$IP/extensions/SemanticImageInput/SemanticImageInput.php"; You also need to enable instant commons: https://www.mediawiki.org/wiki/Instant_commons -This is done by adding the following code to your LocalSettings.php file: +This is done by adding the following code to your "LocalSettings.php" file: # Enable instant commons $wgUseInstantCommons = true; @@ -42,10 +44,10 @@ == Configuration == -Configuration of Contest is done by assigning to $egSIISettings in your -[[Manual:LocalSettings.php|LocalSettings.php]] file, AFTER the inclusion of the -extension. The options are listed below and their default is set in the Contest settings file: -http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticImageInput/SemanticImageInput.settings.php?view=markup +Configuration of Contest is done by assigning to $egSIISettings in your "LocalSettings.php" file, +AFTER the inclusion of the extension. The options are listed below and their default is set in the +settings file: +https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FSemanticImageInput.git/master/SemanticImageInput.settings.php You should NOT modify the settings file, but can have a look at it to get an idea of how to use the settings, in case the below descriptions do not suffice. diff --git a/README b/README index 1f1dc89..6e45fdf 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -These is the readme file for the Semantic Image Input extension. +These is the README file for the Semantic Image Input extension. Extension page on mediawiki.org: https://www.mediawiki.org/wiki/Extension:Semantic_Image_Input -Latest version of the readme file: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticImageInput/README?view=co +Latest version of the readme file: https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FSemanticImageInput.git/master/README == About == diff --git a/SemanticImageInput.php b/SemanticImageInput.php index c1941f4..c21876a 100644 --- a/SemanticImageInput.php +++ b/SemanticImageInput.php @@ -25,7 +25,7 @@ // Show an error if Semantic MediaWiki is not loaded. if ( ! defined( 'SMW_VERSION' ) ) { - die( '<b>Error:</b> You need to have <a href="http://semantic-mediawiki.org/wiki/Semantic_MediaWiki";>Semantic MediaWiki</a> installed in order to use Semantic Image Input.<br />' ); + die( '<b>Error:</b> You need to have <a href="https://www.semantic-mediawiki.org/wiki/Semantic_MediaWiki";>Semantic MediaWiki</a> installed in order to use Semantic Image Input.<br />' ); } // Show an error if Semantic MediaWiki is not loaded. @@ -40,26 +40,25 @@ 'name' => 'Semantic Image Input', 'version' => SII_VERSION, 'author' => array( - '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', + '[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' + 'descriptionmsg' => 'sii-desc', + 'license-name' => 'GPL-3.0+' ); // i18n $wgMessagesDirs['SemanticImageInput'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['SemanticImageInput'] = dirname( __FILE__ ) . '/SemanticImageInput.i18n.php'; +$wgExtensionMessagesFiles['SemanticImageInput'] = __DIR__ . '/SemanticImageInput.i18n.php'; // Autoloading -$wgAutoloadClasses['SIISettings'] = dirname( __FILE__ ) . '/SemanticImageInput.settings.php'; - -$wgAutoloadClasses['InstantImageInput'] = dirname( __FILE__ ) . '/includes/InstantImageInput.php'; - +$wgAutoloadClasses['SIISettings'] = __DIR__ . '/SemanticImageInput.settings.php'; +$wgAutoloadClasses['InstantImageInput'] = __DIR__ . '/includes/InstantImageInput.php'; $wgExtensionFunctions[] = 'efSIISetup'; // Resource loader modules $moduleTemplate = array( - 'localBasePath' => dirname( __FILE__ ) . '/resources', + 'localBasePath' => __DIR__ . '/resources', 'remoteExtPath' => 'SemanticImageInput/resources' ); -- To view, visit https://gerrit.wikimedia.org/r/286239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98f57637e74e7d7e2a4ef133a09dcfd353502e19 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticImageInput Gerrit-Branch: master Gerrit-Owner: Kghbln <[email protected]> Gerrit-Reviewer: Jeroen De Dauw <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
