http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66302
Revision: 66302
Author: jeroendedauw
Date: 2010-05-12 21:13:18 +0000 (Wed, 12 May 2010)
Log Message:
-----------
Maps & SM 0.6 rc2, Validator 0.3 rc2
Modified Paths:
--------------
trunk/extensions/Maps/Maps.php
trunk/extensions/SemanticMaps/GeoCoords/SM_AreaValueDescription.php
trunk/extensions/SemanticMaps/GeoCoords/SM_GeoCoordsValue.php
trunk/extensions/SemanticMaps/SemanticMaps.php
trunk/extensions/Validator/Validator.class.php
trunk/extensions/Validator/Validator.php
Modified: trunk/extensions/Maps/Maps.php
===================================================================
--- trunk/extensions/Maps/Maps.php 2010-05-12 21:08:47 UTC (rev 66301)
+++ trunk/extensions/Maps/Maps.php 2010-05-12 21:13:18 UTC (rev 66302)
@@ -33,7 +33,7 @@
echo '<b>Warning:</b> You need to have <a
href="http://www.mediawiki.org/wiki/Extension:Validator";>Validator</a>
installed in order to use <a
href="http://www.mediawiki.org/wiki/Extension:Maps";>Maps</a>.';
}
else {
- define( 'Maps_VERSION', '0.6 a26' );
+ define( 'Maps_VERSION', '0.6 rc2' );
// The different coordinate notations.
define( 'Maps_COORDS_FLOAT', 'float' );
Modified: trunk/extensions/SemanticMaps/GeoCoords/SM_AreaValueDescription.php
===================================================================
--- trunk/extensions/SemanticMaps/GeoCoords/SM_AreaValueDescription.php
2010-05-12 21:08:47 UTC (rev 66301)
+++ trunk/extensions/SemanticMaps/GeoCoords/SM_AreaValueDescription.php
2010-05-12 21:13:18 UTC (rev 66302)
@@ -39,6 +39,8 @@
$ratio = array(
'km' => 1000,
+ 'kilometers' => 1000,
+ 'kilometres' => 1000,
'mile' => 1609.344,
'miles' => 1609.344,
'nautical mile' => 1852,
Modified: trunk/extensions/SemanticMaps/GeoCoords/SM_GeoCoordsValue.php
===================================================================
--- trunk/extensions/SemanticMaps/GeoCoords/SM_GeoCoordsValue.php
2010-05-12 21:08:47 UTC (rev 66301)
+++ trunk/extensions/SemanticMaps/GeoCoords/SM_GeoCoordsValue.php
2010-05-12 21:13:18 UTC (rev 66302)
@@ -265,4 +265,4 @@
return array( 0, 1 );
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/SemanticMaps/SemanticMaps.php
===================================================================
--- trunk/extensions/SemanticMaps/SemanticMaps.php 2010-05-12 21:08:47 UTC
(rev 66301)
+++ trunk/extensions/SemanticMaps/SemanticMaps.php 2010-05-12 21:13:18 UTC
(rev 66302)
@@ -35,7 +35,7 @@
// Only initialize the extension when all dependencies are present.
if ( defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' ) ) {
- define( 'SM_VERSION', '0.6 a26' );
+ define( 'SM_VERSION', '0.6 rc2' );
$smgScriptPath = ( isset( $wgExtensionAssetsPath ) &&
$wgExtensionAssetsPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions'
) . '/SemanticMaps';
$smgDir = dirname( __FILE__ ) . '/';
Modified: trunk/extensions/Validator/Validator.class.php
===================================================================
--- trunk/extensions/Validator/Validator.class.php 2010-05-12 21:08:47 UTC
(rev 66301)
+++ trunk/extensions/Validator/Validator.class.php 2010-05-12 21:13:18 UTC
(rev 66302)
@@ -160,7 +160,7 @@
if ( count( $defaultParams ) > 0 ) {
$defaultParam = array_shift(
$defaultParams );
$parameters[$defaultParam] =
array(
- 'original-value' =>
trim( $parts[0] ),
+ 'original-value' =>
trim( $parts[0] ),
'default' => $defaultNr,
'position' => $nr
);
Modified: trunk/extensions/Validator/Validator.php
===================================================================
--- trunk/extensions/Validator/Validator.php 2010-05-12 21:08:47 UTC (rev
66301)
+++ trunk/extensions/Validator/Validator.php 2010-05-12 21:13:18 UTC (rev
66302)
@@ -24,7 +24,7 @@
die( 'Not an entry point.' );
}
-define( 'Validator_VERSION', '0.3 a6' );
+define( 'Validator_VERSION', '0.3 rc2' );
// Constants indicating the strictness of the parameter validation.
define( 'Validator_ERRORS_NONE', 0 );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
