X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4e45f3a76fbc46280bbbecddd4307d2ab70fa613..36f6d8d85d9549d7652a425600a54cae7be04b4d:/app/controllers/confirmations_controller.rb diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index f9de54df0..7b1c52ca6 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -66,7 +66,7 @@ class ConfirmationsController < ApplicationController flash[:error] = t "confirmations.confirm_resend.failure", :name => params[:display_name] else UserMailer.signup_confirm(user, user.tokens.create).deliver_later - flash[:notice] = t "confirmations.confirm_resend.success_html", :email => user.email, :sender => Settings.email_from + flash[:notice] = { :partial => "confirmations/resend_success_flash", :locals => { :email => user.email, :sender => Settings.email_from } } end redirect_to login_path @@ -129,9 +129,9 @@ class ConfirmationsController < ApplicationController # display a message about th current status of the gravatar setting def gravatar_status_message(user) if user.image_use_gravatar - t "users.account.gravatar.enabled" + t "profiles.edit.gravatar.enabled" else - t "users.account.gravatar.disabled" + t "profiles.edit.gravatar.disabled" end end end