X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2d111c0f34613779bb730f1d0a823fa48e9d8439..9018d1af07c53b03bf8caf0480b931dc25f57147:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 43933041c..3101e5af2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -42,7 +42,7 @@ class UsersController < ApplicationController if current_user current_user.terms_seen = true - flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save + flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save if params[:referer] redirect_to safe_referer(params[:referer]) @@ -321,9 +321,9 @@ class UsersController < ApplicationController when "active", "confirmed" successful_login(user, request.env["omniauth.params"]["referer"]) when "suspended" - failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe + failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe else - failed_login t("users.login.auth failure") + failed_login t("sessions.new.auth failure") end else redirect_to :action => "new", :nickname => name, :email => email,