X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/22946d703a1186d0ec7fb18a663f73855bb49546..dc28f1dccc5589afa667bf6959f12e6b18589459:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 603feb4db..6d98c17f6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -53,7 +53,7 @@ class UsersController < ApplicationController end def new - @title = t "users.new.title" + @title = t ".title" @referer = if params[:referer] safe_referer(params[:referer]) else @@ -127,7 +127,7 @@ class UsersController < ApplicationController if request.xhr? render :partial => "terms" else - @title = t "users.terms.title" + @title = t ".title" if current_user&.terms_agreed? # Already agreed to terms, so just show settings @@ -220,7 +220,7 @@ class UsersController < ApplicationController def go_public current_user.data_public = true current_user.save - flash[:notice] = t "users.go_public.flash success" + flash[:notice] = t ".flash success" redirect_to edit_account_path 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 @@ -304,7 +304,7 @@ class UsersController < ApplicationController ## # omniauth failure callback def auth_failure - flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error")) + flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t(".unknown_error")) origin = safe_referer(params[:origin]) if params[:origin]