X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/938cdd8503f9e9257e9b023eb25ed32d6668bf74..718d0ccf3c9d2548ae6c60ae0df4b53dea9a29d2:/app/models/notifier.rb?ds=sidebyside diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 80a8ae485..ba4530e99 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -53,7 +53,7 @@ class Notifier < ActionMailer::Base def message_notification(message) common_headers message.recipient - subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name) + subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale) body :to_user => message.recipient.display_name, :from_user => message.sender.display_name, :body => message.body, @@ -68,7 +68,7 @@ class Notifier < ActionMailer::Base def diary_comment_notification(comment) common_headers comment.diary_entry.user - subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name) + subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => locale) body :to_user => comment.diary_entry.user.display_name, :from_user => comment.user.display_name, :body => comment.body, @@ -97,7 +97,7 @@ class Notifier < ActionMailer::Base befriendee = User.find_by_id(friend.friend_user_id) common_headers befriendee - subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name) + subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale) body :user => befriender.display_name, :userurl => url_for(:host => SERVER_URL, :controller => "user", :action => "view",