Fix validator format.

nkovacs · Jul 3, 2015 · 743a044 · 743a044
1 parent 9d067d5
commit 743a044
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/DateTimeValidator.php b/DateTimeValidator.php
@@ -2,6 +2,7 @@
 
 namespace nkovacs\datetimepicker;
 
+use Yii;
 use yii\validators\Validator;
 
 /**
@@ -21,10 +22,25 @@ class DateTimeValidator extends \yii\validators\DateValidator
      */
     public function init()
     {
-        parent::init();
+        if ($this->format === null) {
+            switch ($this->type) {
+                case 'date':
+                    $this->format = Yii::$app->formatter->dateFormat;
+                    break;
+                case 'time':
+                    $this->format = Yii::$app->formatter->timeFormat;
+                    break;
+                case 'datetime':
+                    $this->format = Yii::$app->formatter->datetimeFormat;
+                    break;
+            }
+        }
+
         // if $this->format is a short format,
         // convert it to a pattern, so that DateValidator will respect $this->type.
         $this->format = FormatConverter::convertIcuShortFormatToPattern($this->format, $this->type, $this->locale);
+
+        parent::init();
     }
 
     /**