Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-04 22:44:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1870: Validation errors weren't properly translated when using clientside validation

Browse Source
This commit is contained in:
Alexander Makarov
2014-01-12 21:37:28 +04:00
parent 718ddfb99c
commit 4239b2a5f2
10 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
framework/validators/StringValidator.php
View File

@@ -151,30 +151,30 @@ class StringValidator extends Validator
$label = $object->getAttributeLabel($attribute);
$options = [
'message' => strtr($this->message, [
'message' => Yii::t('yii', $this->message, [
'{attribute}' => $label,
]),
];
if ($this->min !== null) {
$options['min'] = $this->min;
$options['tooShort'] = strtr($this->tooShort, [
'{attribute}' => $label,
'{min}' => $this->min,
$options['tooShort'] = Yii::t('yii', $this->tooShort, [
'attribute' => $label,
'min' => $this->min,
]);
}
if ($this->max !== null) {
$options['max'] = $this->max;
$options['tooLong'] = strtr($this->tooLong, [
'{attribute}' => $label,
'{max}' => $this->max,
$options['tooLong'] = Yii::t('yii', $this->tooLong, [
'attribute' => $label,
'max' => $this->max,
]);
}
if ($this->length !== null) {
$options['is'] = $this->length;
$options['notEqual'] = strtr($this->notEqual, [
'{attribute}' => $label,
'{length}' => $this->length,
$options['notEqual'] = Yii::t('yii', $this->notEqual, [
'attribute' => $label,
'length' => $this->length,
]);
}
if ($this->skipOnEmpty) {