X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/094d6c8bb9949825e1e66b07ba39190a8b57aa0b..e4c40cbd36567d050f1b779f1444c4ef26c50a5b:/app/controllers/confirmations_controller.rb?ds=sidebyside diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index b77ed09b3..2a00a49b0 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.support_email + flash[:notice] = { :partial => "confirmations/resend_success_flash", :locals => { :email => user.email, :sender => Settings.email_from } } end redirect_to login_path @@ -93,10 +93,10 @@ class ConfirmationsController < ApplicationController current_user.tokens.delete_all session[:user] = current_user.id session[:fingerprint] = current_user.fingerprint - redirect_to :controller => :users, :action => :account, :display_name => current_user.display_name + redirect_to user_account_path(current_user) elsif token flash[:error] = t "confirmations.confirm_email.failure" - redirect_to :controller => :users, :action => :account, :display_name => token.user.display_name + redirect_to user_account_path(token.user) else flash[:error] = t "confirmations.confirm_email.unknown_token" end @@ -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