Download as
Browse Code »

Commit 962ccce3d1c32be308697522f52291b58b982d25

Authored by Dmitriy Zaporozhets
2 parents 88176dad 6b4602a7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4113 from peterlefanulumsdaine/master 

grammar fix in an error message (very minor change)
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @962ccce
... ... @@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base
32 32 def reject_blocked!
33 33 if current_user && current_user.blocked?
34 34 sign_out current_user
35   - flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
  35 + flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
36 36 redirect_to new_user_session_path
37 37 end
38 38 end
... ... @@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
40 40 def after_sign_in_path_for resource
41 41 if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked?
42 42 sign_out resource
43   - flash[:alert] = "Your account is blocked. Retry when an admin unblock it."
  43 + flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
44 44 new_user_session_path
45 45 else
46 46 super
... ...