Reconfigure the suspended flash message to avoid html_safe
This also avoids having raw html in the translation strings
This commit is contained in:
parent
52c0bb5e73
commit
972249ce9d
4 changed files with 8 additions and 3 deletions
|
@ -52,7 +52,7 @@ class SessionsController < ApplicationController
|
|||
elsif (user = User.authenticate(:username => username, :password => password, :pending => true))
|
||||
unconfirmed_login(user)
|
||||
elsif User.authenticate(:username => username, :password => password, :suspended => true)
|
||||
failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe, username
|
||||
failed_login({ :partial => "sessions/suspended_flash" }, username)
|
||||
else
|
||||
failed_login t("sessions.new.auth failure"), username
|
||||
end
|
||||
|
|
|
@ -290,7 +290,7 @@ class UsersController < ApplicationController
|
|||
when "active", "confirmed"
|
||||
successful_login(user, request.env["omniauth.params"]["referer"])
|
||||
when "suspended"
|
||||
failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
|
||||
failed_login({ :partial => "sessions/suspended_flash" })
|
||||
else
|
||||
failed_login t("sessions.new.auth failure")
|
||||
end
|
||||
|
|
2
app/views/sessions/_suspended_flash.html.erb
Normal file
2
app/views/sessions/_suspended_flash.html.erb
Normal file
|
@ -0,0 +1,2 @@
|
|||
<p><%= t ".suspended" %></p>
|
||||
<p><%= t ".contact_support_html", :support_link => mail_to(Settings.support_email, t(".support")) %></p>
|
Loading…
Add table
Add a link
Reference in a new issue