http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72819
Revision: 72819
Author: jeroendedauw
Date: 2010-09-11 16:02:48 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Changes for 0.7 - fixed message key and wrong class name
Modified Paths:
--------------
trunk/extensions/Maps/Maps.i18n.php
trunk/extensions/Maps/includes/criteria/CriterionMapDimension.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
Modified: trunk/extensions/Maps/Maps.i18n.php
===================================================================
--- trunk/extensions/Maps/Maps.i18n.php 2010-09-11 15:55:02 UTC (rev 72818)
+++ trunk/extensions/Maps/Maps.i18n.php 2010-09-11 16:02:48 UTC (rev 72819)
@@ -23,7 +23,11 @@
'maps_map' => 'Map',
'maps-loading-map' => 'Loading map...',
'maps-markers' => 'Markers',
+
+ // Validation
'validation-error-invalid-location' => 'Parameter $1 must be a valid
location.',
+ 'validation-error-invalid-width' => 'Parameter $1 must be a valid
width.',
+ 'validation-error-invalid-height' => 'Parameter $1 must be a valid
height.',
// Coordinate handling
'maps-abb-north' => 'N',
Modified: trunk/extensions/Maps/includes/criteria/CriterionMapDimension.php
===================================================================
--- trunk/extensions/Maps/includes/criteria/CriterionMapDimension.php
2010-09-11 15:55:02 UTC (rev 72818)
+++ trunk/extensions/Maps/includes/criteria/CriterionMapDimension.php
2010-09-11 16:02:48 UTC (rev 72819)
@@ -69,7 +69,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( '', 'parsemag', $parameter->value );
+ return wfMsgExt( "validation-error-invalid-$this->dimension",
'parsemag', $parameter->getOriginalName() );
}
/**
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-11 15:55:02 UTC (rev 72818)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-11 16:02:48 UTC (rev 72819)
@@ -75,7 +75,7 @@
'tolower' => false,
'aliases' => array( 'coords', 'location',
'address' ),
'criteria' => array(
- new CriterionAreLocations()
+ new CriterionIsLocation()
),
'output-type' => 'coordinateSet',
),
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-11 15:55:02 UTC (rev 72818)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-11 16:02:48 UTC (rev 72819)
@@ -120,7 +120,7 @@
'type' => array( 'string', 'list', ';' ),
'aliases' => array( 'coords', 'location',
'locations', 'address', 'addresses' ),
'criteria' => array(
- new CriterionAreLocations( '~' )
+ new CriterionIsLocation( '~' )
),
'output-type' => array( 'geoPoints', '~' ),
),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
