Commit 962ccce3d1c32be308697522f52291b58b982d25
Exists in
master
and in
4 other branches
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
| @@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base | @@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base | ||
| 32 | def reject_blocked! | 32 | def reject_blocked! |
| 33 | if current_user && current_user.blocked? | 33 | if current_user && current_user.blocked? |
| 34 | sign_out current_user | 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 | redirect_to new_user_session_path | 36 | redirect_to new_user_session_path |
| 37 | end | 37 | end |
| 38 | end | 38 | end |
| @@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base | @@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base | ||
| 40 | def after_sign_in_path_for resource | 40 | def after_sign_in_path_for resource |
| 41 | if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked? | 41 | if resource.is_a?(User) && resource.respond_to?(:blocked?) && resource.blocked? |
| 42 | sign_out resource | 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 | new_user_session_path | 44 | new_user_session_path |
| 45 | else | 45 | else |
| 46 | super | 46 | super |