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

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

diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index b77ed09b3138caf9092cc0a3505ad5bb58aae652..a482bc96de0da11b52335a7790879fc0155f9ad9 100644 (file)
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -16,16 +16,16 @@ 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
       else
         user = token.user
-        user.status = "active"
+        user.activate
         user.email_valid = true
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!
@@ -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,10 +63,10 @@ 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] = 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
@@ -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
@@ -93,13 +93,13 @@ 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
       elsif token
-        flash[:error] = t "confirmations.confirm_email.failure"
-        redirect_to :controller => :users, :action => :account, :display_name => token.user.display_name
+        flash[:error] = t ".failure"
       else
-        flash[:error] = t "confirmations.confirm_email.unknown_token"
+        flash[:error] = t ".unknown_token"
       end
+
+      redirect_to edit_account_path
     end
   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