X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2c1033f62d450b7ed82058ee89d99983b7d97829..030591e3187690b457ea9b0bf32e2e4fd1efa5c6:/app/mailers/user_mailer.rb

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 24444ce1b..e0f3bb5f6 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -17,7 +17,7 @@ class UserMailer < ApplicationMailer
                      :confirm_string => token.token)
 
       mail :to => user.email,
-           :subject => I18n.t("user_mailer.signup_confirm.subject")
+           :subject => t(".subject")
     end
   end
 
@@ -28,7 +28,7 @@ class UserMailer < ApplicationMailer
                      :confirm_string => token.token)
 
       mail :to => user.new_email,
-           :subject => I18n.t("user_mailer.email_confirm.subject")
+           :subject => t(".subject")
     end
   end
 
@@ -38,12 +38,13 @@ class UserMailer < ApplicationMailer
                      :token => token.token)
 
       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
       @trace_name = trace.name
       @trace_points = trace.size
       @trace_description = trace.description
@@ -51,19 +52,20 @@ class UserMailer < ApplicationMailer
       @possible_points = possible_points
 
       mail :to => trace.user.email,
-           :subject => I18n.t("user_mailer.gpx_notification.success.subject")
+           :subject => t(".subject")
     end
   end
 
   def gpx_failure(trace, error)
     with_recipient_locale trace.user do
+      @to_user = trace.user.display_name
       @trace_name = trace.name
       @trace_description = trace.description
       @trace_tags = trace.tags
       @error = error
 
       mail :to => trace.user.email,
-           :subject => I18n.t("user_mailer.gpx_notification.failure.subject")
+           :subject => t(".subject")
     end
   end
 
@@ -102,7 +104,7 @@ class UserMailer < ApplicationMailer
 
       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
            :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
 
@@ -115,7 +117,7 @@ class UserMailer < ApplicationMailer
 
       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
 
@@ -130,7 +132,7 @@ class UserMailer < ApplicationMailer
       @commenter = if comment.author
                      comment.author.display_name
                    else
-                     I18n.t("user_mailer.note_comment_notification.anonymous")
+                     t(".anonymous")
                    end
 
       @author = @commenter
@@ -139,9 +141,9 @@ class UserMailer < ApplicationMailer
       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
-                  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
@@ -161,9 +163,9 @@ class UserMailer < ApplicationMailer
       @author = @commenter
 
       subject = if @owner
-                  I18n.t("user_mailer.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
+                  t(".commented.subject_own", :commenter => @commenter)
                 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)