Commit c177593e2cf282f09934640bd597e6e3c5f32893
Exists in
master
and in
4 other branches
Merge pull request #2059 from dolanor/feature-rewording-blocked-users
Rewording for the account being blocked
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/controllers/application_controller.rb
| @@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base | @@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base | ||
| 35 | def reject_blocked! | 35 | def reject_blocked! |
| 36 | if current_user && current_user.blocked | 36 | if current_user && current_user.blocked |
| 37 | sign_out current_user | 37 | sign_out current_user |
| 38 | - flash[:alert] = "Your account was blocked" | 38 | + flash[:alert] = "Your account is blocked. Retry when an admin unblock it." |
| 39 | redirect_to new_user_session_path | 39 | redirect_to new_user_session_path |
| 40 | end | 40 | end |
| 41 | end | 41 | end |
| @@ -43,7 +43,7 @@ class ApplicationController < ActionController::Base | @@ -43,7 +43,7 @@ class ApplicationController < ActionController::Base | ||
| 43 | def after_sign_in_path_for resource | 43 | def after_sign_in_path_for resource |
| 44 | if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked | 44 | if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked |
| 45 | sign_out resource | 45 | sign_out resource |
| 46 | - flash[:alert] = "Your account was blocked" | 46 | + flash[:alert] = "Your account is blocked. Retry when an admin unblock it." |
| 47 | new_user_session_path | 47 | new_user_session_path |
| 48 | else | 48 | else |
| 49 | super | 49 | super |