Grammar fix in error message for blocked login (in "application_controller.rb")

6b4602a7 · Peter LeFanu Lumsdaine · 45f9cca9 · 6b4602a7
Commit 6b4602a7 authored May 28, 2013 by Peter LeFanu Lumsdaine
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/controllers/application_controller.rb app/controllers/application_controller.rb +2 -2

No files found.
--- 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