Validator: %label trims colon

Author: dg

src/Forms/Validator.php

@@ -69,7 +69,9 @@ public static function formatMessage(Rule $rule, bool $withValue = true)
 			static $i = -1;
 			switch ($m[1]) {
 				case 'name': return $rule->control->getName();
-				case 'label': return $rule->control instanceof Controls\BaseControl ? $rule->control->translate($rule->control->getCaption()) : null;
+				case 'label': return $rule->control instanceof Controls\BaseControl
+					? rtrim($rule->control->translate($rule->control->getCaption()), ':')
+					: null;
 				case 'value': return $withValue ? $rule->control->getValue() : $m[0];
 				default:
 					$args = is_array($rule->arg) ? $rule->arg : [$rule->arg];

tests/Forms/Rules.formatMessage.phpt

@@ -29,7 +29,7 @@ $form->addText('args3')
 	->addRule(Form::LENGTH, '%d %d', 1)
 	->setDefaultValue('xyz');
 
-$form->addText('special', 'Label')
+$form->addText('special', 'Label:')
 	->setRequired()
 	->addRule(Form::EMAIL, '%label %value is invalid [field %name] %d', $form['special'])
 	->setDefaultValue('xyz');