X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c59471842f064e5add5c5203134d27e1c48e20d3..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/controllers/sessions_controller.rb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 5b46d67d0..ba2858ce4 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -24,7 +24,7 @@ class SessionsController < ApplicationController end def destroy - @title = t "sessions.destroy.title" + @title = t ".title" if request.post? if session[:token] @@ -38,11 +38,7 @@ class SessionsController < ApplicationController referer = safe_referer(params[:referer]) if params[:referer] - if referer - redirect_to referer - else - redirect_to :controller => "site", :action => "index" - end + redirect_to referer || { :controller => "site", :action => "index" } end end @@ -56,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