Improve warning messages

gammerce · Sep 20, 2023 · 8f06b91 · 8f06b91
1 parent 1aa9238
commit 8f06b91
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/includes/Http/Validation/Rules/PostalCodeRule.php b/includes/Http/Validation/Rules/PostalCodeRule.php
@@ -6,6 +6,8 @@
 
 class PostalCodeRule extends RegexRule
 {
+    protected string $errorMessage = "field_postal_code_warn";
+
     public function __construct(string $pattern = "/^\d{2}-\d{3}$/")
     {
         parent::__construct($pattern);

diff --git a/includes/Http/Validation/Rules/RegexRule.php b/includes/Http/Validation/Rules/RegexRule.php
@@ -6,7 +6,8 @@
 
 class RegexRule extends BaseRule
 {
-    private string $pattern;
+    protected string $pattern;
+    protected string $errorMessage = "field_regex_warn";
 
     public function __construct(string $pattern)
     {
@@ -17,7 +18,7 @@ public function __construct(string $pattern)
     public function validate($attribute, $value, array $data): void
     {
         if (!preg_match($this->pattern, $value)) {
-            throw new ValidationException($this->lang->t("field_regex_warn"));
+            throw new ValidationException($this->lang->t($this->errorMessage));
         }
     }
 }
diff --git a/translations/english/general.php b/translations/english/general.php
@@ -37,7 +37,8 @@
     "field_length_min_warn" => "Field must consist of min. {1} chars.",
     "field_must_be_number" => "Field must contain a number.",
     "field_no_empty" => "Field cannot be empty.",
-    "field_regex_warn" => "Field value does not meet requirements.",
+    "field_postal_code_warn" => "Value has to match 00-000 format.",
+    "field_regex_warn" => "Value does not meet requirements.",
     "firstname" => "Firstname",
     "forever" => "Forever",
     "form_wrong_filled" => "Not all the form fields were filled correctly.",

diff --git a/translations/polish/general.php b/translations/polish/general.php
@@ -37,6 +37,7 @@
     "field_length_min_warn" => "Pole musi się składać z co najmniej {1} znaków.",
     "field_must_be_number" => "W polu musi się znajdować liczba.",
     "field_no_empty" => "Pole nie może być puste.",
+    "field_postal_code_warn" => "Wprowadzona wartość musi być formatu 00-000.",
     "field_regex_warn" => "Wprowadzona wartość nie spełnia wymagań.",
     "firstname" => "Imię",
     "forever" => "Na zawsze",