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

fixes #1870: better fix that is message extractor friendly

Browse Source
This commit is contained in:
Alexander Makarov
2014-01-12 23:11:57 +04:00
parent cdfaf9500d
commit e7fab51efc
9 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
framework/validators/StringValidator.php
View File

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