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

[rails.git] / app / mailers / user_mailer.rb

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 4f56d990084e7496dcd3f7f67b76b8d1a9321345..dee3dafbed35562ab865f11c64fcad4d61e8a067 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -10,11 +10,12 @@ class UserMailer < ApplicationMailer
   before_action :set_shared_template_vars
   before_action :attach_project_logo
 
   before_action :set_shared_template_vars
   before_action :attach_project_logo
 

-  def signup_confirm(user, token)
+  def signup_confirm(user, token, referer = nil)

     with_recipient_locale user do
       @url = url_for(:controller => "confirmations", :action => "confirm",
                      :display_name => user.display_name,
     with_recipient_locale user do
       @url = url_for(:controller => "confirmations", :action => "confirm",
                      :display_name => user.display_name,

-                     :confirm_string => token.token)
+                     :confirm_string => token,
+                     :referer => referer)

 
       mail :to => user.email,
            :subject => t(".subject")
 
       mail :to => user.email,
            :subject => t(".subject")


@@ -25,7 +26,7 @@ class UserMailer < ApplicationMailer
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:controller => "confirmations", :action => "confirm_email",
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:controller => "confirmations", :action => "confirm_email",

-                     :confirm_string => token.token)
+                     :confirm_string => token)

 
       mail :to => user.new_email,
            :subject => t(".subject")
 
       mail :to => user.new_email,
            :subject => t(".subject")


@@ -34,7 +35,7 @@ class UserMailer < ApplicationMailer
 
   def lost_password(user, token)
     with_recipient_locale user do
 
   def lost_password(user, token)
     with_recipient_locale user do

-      @url = user_reset_password_url(:token => token.token)
+      @url = user_reset_password_url(:token => token)

 
       mail :to => user.email,
            :subject => t(".subject")
 
       mail :to => user.email,
            :subject => t(".subject")


@@ -176,7 +177,7 @@ class UserMailer < ApplicationMailer
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name

-      @unsubscribe_url = changeset_unsubscribe_url(comment.changeset)
+      @unsubscribe_url = unsubscribe_changeset_url(comment.changeset)

       @author = @commenter
 
       subject = if @owner
       @author = @commenter
 
       subject = if @owner


@@ -192,7 +193,7 @@ class UserMailer < ApplicationMailer
       set_list_headers(
         "#{comment.changeset.id}.changeset.www.openstreetmap.org",
         t(".description", :id => comment.changeset.id),
       set_list_headers(
         "#{comment.changeset.id}.changeset.www.openstreetmap.org",
         t(".description", :id => comment.changeset.id),

-        :subscribe => changeset_subscribe_url(comment.changeset),
+        :subscribe => subscribe_changeset_url(comment.changeset),

         :unsubscribe => @unsubscribe_url,
         :archive => @changeset_url
       )
         :unsubscribe => @unsubscribe_url,
         :archive => @changeset_url
       )


@@ -246,8 +247,8 @@ class UserMailer < ApplicationMailer
     end
   end
 
     end
   end
 

-  def with_recipient_locale(recipient, &block)
-    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block)
+  def with_recipient_locale(recipient, &)
+    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &)

   end
 
   def from_address(name, type, id, token, user_id = nil)
   end
 
   def from_address(name, type, id, token, user_id = nil)