http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72804
Revision: 72804
Author: jeroendedauw
Date: 2010-09-11 14:19:44 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Changes for 0.4 - work on error message i18n
Modified Paths:
--------------
trunk/extensions/Validator/includes/criteria/CriterionHasLength.php
trunk/extensions/Validator/includes/criteria/CriterionInRange.php
trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
Modified: trunk/extensions/Validator/includes/criteria/CriterionHasLength.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionHasLength.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionHasLength.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -43,7 +43,12 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_invalid_argument',
'parsemag', $parameter->value );
+ if ( $this->lowerBound == $this->upperBound ) {
+ return wfMsgExt( 'validator-error-invalid-length',
'parsemag', $parameter->getOriginalName(), $this->lowerBound );
+ }
+ else {
+ return wfMsgExt(
'validator-error-invalid-length-range', 'parsemag',
$parameter->getOriginalName(), $this->lowerBound, $this->upperBound );
+ }
}
/**
Modified: trunk/extensions/Validator/includes/criteria/CriterionInRange.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionInRange.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionInRange.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -48,7 +48,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_invalid_range', 'parsemag',
$parameter->value );
+ return wfMsgExt( 'validator_error_invalid_range', 'parsemag',
$parameter->getOriginalName(), $this->lowerBound, $this->upperBound );
}
/**
Modified: trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionIsFloat.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -33,7 +33,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_invalid_argument',
'parsemag', $parameter->value );
+ return wfMsgExt( 'validator-error-must-be-float', 'parsemag',
$parameter->getOriginalName() );
}
/**
Modified: trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionIsInteger.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -33,7 +33,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_must_be_integer', 'parsemag',
$parameter->value );
+ return wfMsgExt( 'validator_error_must_be_integer', 'parsemag',
$parameter->getOriginalName() );
}
/**
Modified: trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionIsNumeric.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -33,7 +33,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_must_be_number', 'parsemag',
$parameter->value );
+ return wfMsgExt( 'validator_error_must_be_number', 'parsemag',
$parameter->getOriginalName() );
}
/**
Modified: trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionMatchesRegex.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -46,7 +46,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_invalid_argument',
'parsemag', $parameter->value );
+ return wfMsgExt( 'validator_error_invalid_argument',
'parsemag', $parameter->value, $parameter->getOriginalName() );
}
/**
Modified: trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
2010-09-11 13:45:51 UTC (rev 72803)
+++ trunk/extensions/Validator/includes/criteria/CriterionNotEmpty.php
2010-09-11 14:19:44 UTC (rev 72804)
@@ -33,7 +33,7 @@
* @see ItemParameterCriterion::getItemErrorMessage
*/
protected function getItemErrorMessage( Parameter $parameter ) {
- return wfMsgExt( 'validator_error_empty_argument', 'parsemag',
$parameter->value );
+ return wfMsgExt( 'validator_error_empty_argument', 'parsemag',
$parameter->getOriginalName() );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
