Merge remote-tracking branch 'upstream/pull/3285'

[rails.git] / app / controllers / confirmations_controller.rb

diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index b77ed09b3138caf9092cc0a3505ad5bb58aae652..2a00a49b0446a01654a777df9c09a4ad06525c9e 100644 (file)
--- 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[: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
     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
         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"
       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
       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
   # 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
     else

-      t "users.account.gravatar.disabled"
+      t "profiles.edit.gravatar.disabled"

     end
   end
 end
     end
   end
 end