From 2aeaf4b1099e5459cd4fba9359ea63dc7cd019f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 5 Nov 2010 10:03:52 -0200 Subject: [PATCH] Be more helpful in the already confirmed message, closes #613 --- config/locales/en.yml | 2 +- test/models/confirmable_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 1c1f8256..9dc21f90 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,7 +2,7 @@ en: errors: messages: not_found: "not found" - already_confirmed: "was already confirmed" + already_confirmed: "was already confirmed, please try signing in" not_locked: "was not locked" not_saved: one: "1 error prohibited this %{resource} from being saved:" diff --git a/test/models/confirmable_test.rb b/test/models/confirmable_test.rb index 16890df8..1cca126e 100644 --- a/test/models/confirmable_test.rb +++ b/test/models/confirmable_test.rb @@ -48,7 +48,7 @@ class ConfirmableTest < ActiveSupport::TestCase assert_blank user.errors[:email] assert_not user.confirm! - assert_equal "was already confirmed", user.errors[:email].join + assert_equal "was already confirmed, please try signing in", user.errors[:email].join end test 'should find and confirm an user automatically' do @@ -76,7 +76,7 @@ class ConfirmableTest < ActiveSupport::TestCase user.save confirmed_user = User.confirm_by_token(user.confirmation_token) assert confirmed_user.confirmed? - assert_equal "was already confirmed", confirmed_user.errors[:email].join + assert_equal "was already confirmed, please try signing in", confirmed_user.errors[:email].join end test 'should send confirmation instructions by email' do @@ -160,7 +160,7 @@ class ConfirmableTest < ActiveSupport::TestCase user.confirm! assert_not user.resend_confirmation_token assert user.confirmed? - assert_equal 'was already confirmed', user.errors[:email].join + assert_equal 'was already confirmed, please try signing in', user.errors[:email].join end test 'confirm time should fallback to devise confirm in default configuration' do