Merge branch 'rgrigga-patch-2'

Zizaco · Oct 25, 2014 · 4f552f7 · 4f552f7
2 parents b92de9a + a4036f1
commit 4f552f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/Confide/UserValidator.php b/src/Confide/UserValidator.php
@@ -93,7 +93,7 @@ public function validatePassword(ConfideUserInterface $user)
             } else {
                 $this->attachErrorMsg(
                     $user,
-                    'confide::confide.alerts.wrong_confirmation',
+                    'confide::confide.alerts.password_confirmation',
                     'password_confirmation'
                 );
                 return false;

diff --git a/src/lang/en/confide.php b/src/lang/en/confide.php
@@ -35,6 +35,7 @@
         'wrong_credentials' => 'Incorrect username, email or password.',
         'not_confirmed' => 'Your account may not be confirmed. Check your email for the confirmation link',
         'confirmation' => 'Your account has been confirmed! You may now login.',
+        'password_confirmation' => 'The passwords did not match.', 
         'wrong_confirmation' => 'Wrong confirmation code.',
         'password_forgot' => 'The information regarding password reset was sent to your email.',
         'wrong_password_forgot' => 'User not found.',

diff --git a/tests/Confide/UserValidatorTest.php b/tests/Confide/UserValidatorTest.php
@@ -109,7 +109,7 @@ public function testShouldValidatePassword()
             ->atLeast(1)
             ->with(
                 m::any(),
-                'confide::confide.alerts.wrong_confirmation',
+                'confide::confide.alerts.password_confirmation',
                 'password_confirmation'
             );