cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use rails t helper to allow relative translation keys in email subjects

Browse source 
This makes it easier to rename methods and translation keys.
This commit is contained in:
Andy Allan 2020-11-25 13:45:45 +00:00
parent 5d96da3b67
commit 030591e318
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/mailers/user_mailer.rb
View file

@ -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,7 +38,7 @@ class UserMailer < ApplicationMailer
:token => token.token)
mail :to => user.email,
:subject => I18n.t("user_mailer.lost_password.subject")
:subject => t(".subject")
end
end
@ -52,7 +52,7 @@ class UserMailer < ApplicationMailer
@possible_points = possible_points
mail :to => trace.user.email,
:subject => I18n.t("user_mailer.gpx_success.subject")
:subject => t(".subject")
end
end
@ -65,7 +65,7 @@ class UserMailer < ApplicationMailer
@error = error
mail :to => trace.user.email,
:subject => I18n.t("user_mailer.gpx_failure.subject")
:subject => t(".subject")
end
end
@ -104,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
@ -117,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
@ -132,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
@ -141,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
@ -163,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)