Merge pull request #4405 from tomhughes/normalize-display-name

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

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index ba2ff525d5c077bf77276321af6426ab06b63d81..d1ad60b2cad9c1d9aa2aa6ce150bd77999edc3ce 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -12,47 +12,48 @@ class UserMailer < ApplicationMailer
 
   def signup_confirm(user, token)
     with_recipient_locale user do
 
   def signup_confirm(user, token)
     with_recipient_locale user do

-      @url = url_for(:controller => "users", :action => "confirm",
+      @url = url_for(:controller => "confirmations", :action => "confirm",

                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
       mail :to => user.email,
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
       mail :to => user.email,

-           :subject => I18n.t("user_mailer.signup_confirm.subject")
+           :subject => t(".subject")

     end
   end
 
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email
     end
   end
 
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email

-      @url = url_for(:controller => "users", :action => "confirm_email",
+      @url = url_for(:controller => "confirmations", :action => "confirm_email",

                      :confirm_string => token.token)
 
       mail :to => user.new_email,
                      :confirm_string => token.token)
 
       mail :to => user.new_email,

-           :subject => I18n.t("user_mailer.email_confirm.subject")
+           :subject => t(".subject")

     end
   end
 
   def lost_password(user, token)
     with_recipient_locale user do
     end
   end
 
   def lost_password(user, token)
     with_recipient_locale user do

-      @url = url_for(:controller => "users", :action => "reset_password",
-                     :token => token.token)
+      @url = user_reset_password_url(:token => token.token)

 
       mail :to => user.email,
 
       mail :to => user.email,

-           :subject => I18n.t("user_mailer.lost_password.subject")
+           :subject => t(".subject")

     end
   end
 
   def gpx_success(trace, possible_points)
     with_recipient_locale trace.user do
       @to_user = trace.user.display_name
     end
   end
 
   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,
 
       mail :to => trace.user.email,

-           :subject => I18n.t("user_mailer.gpx_success.subject")
+           :subject => t(".subject")

     end
   end
 
     end
   end
 


@@ -65,7 +66,7 @@ class UserMailer < ApplicationMailer
       @error = error
 
       mail :to => trace.user.email,
       @error = error
 
       mail :to => trace.user.email,

-           :subject => I18n.t("user_mailer.gpx_failure.subject")
+           :subject => t(".subject")

     end
   end
 
     end
   end
 


@@ -81,9 +82,9 @@ 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,
            :to => message.recipient.email,

-           :subject => I18n.t("user_mailer.message_notification.subject_header", :subject => message.title)
+           :subject => t(".subject", :message_title => message.title)

     end
   end
 
     end
   end
 


@@ -102,9 +103,9 @@ 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,
            :to => recipient.email,

-           :subject => I18n.t("user_mailer.diary_comment_notification.subject", :user => comment.user.display_name)
+           :subject => t(".subject", :user => comment.user.display_name)

     end
   end
 
     end
   end
 


@@ -117,13 +118,13 @@ class UserMailer < ApplicationMailer
 
       attach_user_avatar(@friendship.befriender)
       mail :to => friendship.befriendee.email,
 
       attach_user_avatar(@friendship.befriender)
       mail :to => friendship.befriendee.email,

-           :subject => I18n.t("user_mailer.friendship_notification.subject", :user => friendship.befriender.display_name)
+           :subject => t(".subject", :user => friendship.befriender.display_name)

     end
   end
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do
     end
   end
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do

-      @noteurl = browse_note_url(comment.note)
+      @noteurl = note_url(comment.note)

       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author
       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author


@@ -132,7 +133,7 @@ class UserMailer < ApplicationMailer
       @commenter = if comment.author
                      comment.author.display_name
                    else
       @commenter = if comment.author
                      comment.author.display_name
                    else

-                     I18n.t("user_mailer.note_comment_notification.anonymous")
+                     t(".anonymous")

                    end
 
       @author = @commenter
                    end
 
       @author = @commenter


@@ -141,9 +142,9 @@ class UserMailer < ApplicationMailer
       set_references("note", comment.note)
 
       subject = if @owner
       set_references("note", comment.note)
 
       subject = if @owner

-                  I18n.t("user_mailer.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
+                  t(".#{@event}.subject_own", :commenter => @commenter)

                 else
                 else

-                  I18n.t("user_mailer.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
+                  t(".#{@event}.subject_other", :commenter => @commenter)

                 end
 
       mail :to => recipient.email, :subject => subject
                 end
 
       mail :to => recipient.email, :subject => subject


@@ -163,9 +164,9 @@ class UserMailer < ApplicationMailer
       @author = @commenter
 
       subject = if @owner
       @author = @commenter
 
       subject = if @owner

-                  I18n.t("user_mailer.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
+                  t(".commented.subject_own", :commenter => @commenter)

                 else
                 else

-                  I18n.t("user_mailer.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
+                  t(".commented.subject_other", :commenter => @commenter)

                 end
 
       attach_user_avatar(comment.author)
                 end
 
       attach_user_avatar(comment.author)


@@ -183,24 +184,41 @@ class UserMailer < ApplicationMailer
   end
 
   def attach_project_logo
   end
 
   def attach_project_logo

-    attachments.inline["logo.png"] = File.read(Rails.root.join("app/assets/images/osm_logo_30.png"))
+    attachments.inline["logo.png"] = Rails.root.join("app/assets/images/osm_logo_30.png").read

   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)
     avatar = user&.avatar
     if avatar&.attached?
       if avatar.variable?
   end
 
   def user_avatar_file(user)
     avatar = user&.avatar
     if avatar&.attached?
       if avatar.variable?

-        image = avatar.variant(:resize => "50x50>").processed
-        image.service.download(image.key)
+        avatar.variant(:resize_to_limit => [50, 50]).download

       else
         avatar.blob.download
       end
     else
       else
         avatar.blob.download
       end
     else

-      File.read(Rails.root.join("app/assets/images/avatar_small.png"))
+      Rails.root.join("app/assets/images/avatar_small.png").read

     end
   end
 
     end
   end
 


@@ -208,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