From 6b4602a733ddd485c751e52ae831d1c4f2165b92 Mon Sep 17 00:00:00 2001
From: Peter LeFanu Lumsdaine
Date: Tue, 28 May 2013 14:48:51 -0300
Subject: [PATCH] Grammar fix in error message for blocked login (in
"application_controller.rb")
---
app/controllers/application_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d156166503f..9bb86b80d1e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base
def reject_blocked!
if current_user && current_user.blocked?
sign_out current_user
- flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
+ flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
redirect_to new_user_session_path
end
end
@@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
def after_sign_in_path_for resource
if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked?
sign_out resource
- flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
+ flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
new_user_session_path
else
super