Remove unused browse.changeset.comment locale string

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

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index c5c0118e6f8b395da0569c7f12b040bd341f5ffc..d1ad60b2cad9c1d9aa2aa6ce150bd77999edc3ce 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -34,8 +34,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 = url_for(:controller => "passwords", :action => "reset_password",
-                     :token => token.token)
+      @url = user_reset_password_url(:token => token.token)

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


@@ -45,11 +44,13 @@ class UserMailer < ApplicationMailer
   def gpx_success(trace, possible_points)
     with_recipient_locale trace.user do
       @to_user = trace.user.display_name
   def gpx_success(trace, possible_points)
     with_recipient_locale trace.user do
       @to_user = trace.user.display_name

+      @trace_url = show_trace_url(trace.user, trace)

       @trace_name = trace.name
       @trace_points = trace.size
       @trace_description = trace.description
       @trace_tags = trace.tags
       @possible_points = possible_points
       @trace_name = trace.name
       @trace_points = trace.size
       @trace_description = trace.description
       @trace_tags = trace.tags
       @possible_points = possible_points

+      @my_traces_url = url_for(:controller => "traces", :action => "mine")

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


@@ -81,7 +82,7 @@ class UserMailer < ApplicationMailer
 
       attach_user_avatar(message.sender)
 
 
       attach_user_avatar(message.sender)
 

-      mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
+      mail :from => from_address(message.sender.display_name, "m", message.id, message.notification_token),

            :to => message.recipient.email,
            :subject => t(".subject", :message_title => message.title)
     end
            :to => message.recipient.email,
            :subject => t(".subject", :message_title => message.title)
     end


@@ -102,7 +103,7 @@ class UserMailer < ApplicationMailer
 
       set_references("diary", comment.diary_entry)
 
 
       set_references("diary", comment.diary_entry)
 

-      mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
+      mail :from => from_address(comment.user.display_name, "c", comment.id, comment.notification_token(recipient.id), recipient.id),

            :to => recipient.email,
            :subject => t(".subject", :user => comment.user.display_name)
     end
            :to => recipient.email,
            :subject => t(".subject", :user => comment.user.display_name)
     end


@@ -187,7 +188,25 @@ class UserMailer < ApplicationMailer
   end
 
   def attach_user_avatar(user)
   end
 
   def attach_user_avatar(user)

-    attachments.inline["avatar.png"] = user_avatar_file(user)
+    @avatar = user_avatar_filename(user)
+    attachments.inline[@avatar] = user_avatar_file(user)
+  end
+
+  def user_avatar_filename(user)
+    avatar = user&.avatar
+    if avatar&.attached?
+      case avatar.content_type
+      when "image/png" then "avatar.png"
+      when "image/jpeg" then "avatar.jpg"
+      when "image/gif" then "avatar.gif"
+      when "image/bmp" then "avatar.bmp"
+      when "image/tiff" then "avatar.tif"
+      when "image/svg+xml" then "avatar.svg"
+      else "avatar"
+      end
+    else
+      "avatar.png"
+    end

   end
 
   def user_avatar_file(user)
   end
 
   def user_avatar_file(user)


@@ -207,12 +226,12 @@ class UserMailer < ApplicationMailer
     I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block)
   end
 
     I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block)
   end
 

-  def from_address(name, type, id, digest, user_id = nil)
+  def from_address(name, type, id, token, user_id = nil)

     if Settings.key?(:messages_domain) && domain = Settings.messages_domain
       if user_id
     if Settings.key?(:messages_domain) && domain = Settings.messages_domain
       if user_id

-        "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
+        "#{name} <#{type}-#{id}-#{user_id}-#{token}@#{domain}>"

       else
       else

-        "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+        "#{name} <#{type}-#{id}-#{token}@#{domain}>"

       end
     else
       Settings.email_from
       end
     else
       Settings.email_from