[9.x] Make password rule errors translatable (#42060)

* [9.x] Make password rule errors translatable * formatting' Co-authored-by: Taylor Otwell <[email protected]>
laravel · Apr 20, 2022 · df67f44 · df67f44
1 parent 0805622
commit df67f44
Showing 1 changed file with 40 additions and 7 deletions.
diff --git a/src/Illuminate/Validation/Rules/Password.php b/src/Illuminate/Validation/Rules/Password.php
@@ -303,19 +303,31 @@ public function passes($attribute, $value)
             $value = (string) $value;
 
             if ($this->mixedCase && ! preg_match('/(\p{Ll}+.*\p{Lu})|(\p{Lu}+.*\p{Ll})/u', $value)) {
-                $validator->errors()->add($attribute, 'The :attribute must contain at least one uppercase and one lowercase letter.');
+                $validator->errors()->add(
+                    $attribute,
+                    $this->getErrorMessage('validation.password.mixed')
+                );
             }
 
             if ($this->letters && ! preg_match('/\pL/u', $value)) {
-                $validator->errors()->add($attribute, 'The :attribute must contain at least one letter.');
+                $validator->errors()->add(
+                    $attribute,
+                    $this->getErrorMessage('validation.password.letters')
+                );
             }
 
             if ($this->symbols && ! preg_match('/\p{Z}|\p{S}|\p{P}/u', $value)) {
-                $validator->errors()->add($attribute, 'The :attribute must contain at least one symbol.');
+                $validator->errors()->add(
+                    $attribute,
+                    $this->getErrorMessage('validation.password.symbols')
+                );
             }
 
             if ($this->numbers && ! preg_match('/\pN/u', $value)) {
-                $validator->errors()->add($attribute, 'The :attribute must contain at least one number.');
+                $validator->errors()->add(
+                    $attribute,
+                    $this->getErrorMessage('validation.password.numbers')
+                );
             }
         });
 
@@ -327,9 +339,7 @@ public function passes($attribute, $value)
             'value' => $value,
             'threshold' => $this->compromisedThreshold,
         ])) {
-            return $this->fail(
-                'The given :attribute has appeared in a data leak. Please choose a different :attribute.'
-            );
+            return $this->fail($this->getErrorMessage('validation.password.uncompromised'));
         }
 
         return true;
@@ -345,6 +355,29 @@ public function message()
         return $this->messages;
     }
 
+    /**
+     * Get the translated password error message.
+     *
+     * @param  string  $key
+     * @return string
+     */
+    protected function getErrorMessage($key)
+    {
+        $messages = [
+            'validation.password.mixed' => 'The :attribute must contain at least one uppercase and one lowercase letter.',
+            'validation.password.letters' => 'The :attribute must contain at least one letter.',
+            'validation.password.symbols' => 'The :attribute must contain at least one symbol.',
+            'validation.password.numbers' => 'The :attribute must contain at least one number.',
+            'validation.password.uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+        ];
+
+        if (($message = $this->validator->getTranslator()->get($key)) !== $key) {
+            return $message;
+        }
+
+        return $messages[$key];
+    }
+
     /**
      * Adds the given failures, and return false.
      *