Add Validation::setLanguage and lazy-load Language

aplus-framework · Feb 3, 2022 · bf0aed7 · bf0aed7
1 parent 96a4c21
commit bf0aed7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "ext-json": "*",
         "aplus/debug": "^2.4",
         "aplus/helpers": "^2.3",
-        "aplus/language": "^1.7"
+        "aplus/language": "^1.8"
     },
     "require-dev": {
         "ext-xdebug": "*",

diff --git a/src/Validation.php b/src/Validation.php
@@ -79,15 +79,26 @@ public function __construct(array $validators = null, Language $language = null)
         $this->validators = empty($validators)
             ? $defaultValidators
             : \array_reverse($validators);
+        if ($language) {
+            $this->setLanguage($language);
+        }
+    }
+
+    public function setLanguage(Language $language = null) : static
+    {
         if ($language === null) {
-            $language = new Language('en');
+            $language = new Language();
         }
         $language->addDirectory(__DIR__ . '/Languages');
         $this->language = $language;
+        return $this;
     }
 
     public function getLanguage() : Language
     {
+        if ( ! isset($this->language)) {
+            $this->setLanguage();
+        }
         return $this->language;
     }
 
@@ -262,9 +273,9 @@ public function getFilledMessage(string $field, string $rule, array $args = [])
     {
         $message = $this->getMessage($field, $rule);
         if ($message === null) {
-            return $this->language->render('validation', $rule, $args);
+            return $this->getLanguage()->render('validation', $rule, $args);
         }
-        return $this->language->formatMessage($message, $args);
+        return $this->getLanguage()->formatMessage($message, $args);
     }
 
     /**