X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/49cde0e9013848d2d3bd33f19fe106296505b6b2..b45642d2abca834c59e7db1fda512151393c88cc:/app/controllers/confirmations_controller.rb diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index 06e7c8e7d..a482bc96d 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -16,10 +16,10 @@ class ConfirmationsController < ApplicationController if request.post? token = UserToken.find_by(:token => params[:confirm_string]) if token&.user&.active? - flash[:error] = t("confirmations.confirm.already active") + flash[:error] = t(".already active") redirect_to login_path elsif !token || token.expired? - flash[:error] = t("confirmations.confirm.unknown token") + flash[:error] = t(".unknown token") redirect_to :action => "confirm" elsif !token.user.visible? render_unknown_user token.user.display_name @@ -40,7 +40,7 @@ class ConfirmationsController < ApplicationController end if token.nil? || token.user != user - flash[:notice] = t("confirmations.confirm.success") + flash[:notice] = t(".success") redirect_to login_path(:referer => referer) else token.destroy @@ -63,7 +63,7 @@ class ConfirmationsController < ApplicationController token = UserToken.find_by(:token => session[:token]) if user.nil? || token.nil? || token.user != user - flash[:error] = t "confirmations.confirm_resend.failure", :name => params[:display_name] + flash[:error] = t ".failure", :name => params[:display_name] else UserMailer.signup_confirm(user, user.tokens.create).deliver_later flash[:notice] = { :partial => "confirmations/resend_success_flash", :locals => { :email => user.email, :sender => Settings.email_from } } @@ -83,9 +83,9 @@ class ConfirmationsController < ApplicationController gravatar_enabled = gravatar_enable(current_user) if current_user.save flash[:notice] = if gravatar_enabled - "#{t('confirmations.confirm_email.success')} #{gravatar_status_message(current_user)}" + "#{t('.success')} #{gravatar_status_message(current_user)}" else - t("confirmations.confirm_email.success") + t(".success") end else flash[:errors] = current_user.errors @@ -94,9 +94,9 @@ class ConfirmationsController < ApplicationController session[:user] = current_user.id session[:fingerprint] = current_user.fingerprint elsif token - flash[:error] = t "confirmations.confirm_email.failure" + flash[:error] = t ".failure" else - flash[:error] = t "confirmations.confirm_email.unknown_token" + flash[:error] = t ".unknown_token" end redirect_to edit_account_path