From 2c766bd4b4c6dcf8e7c9a6dd9421edca0de57aba Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 16 Nov 2016 17:51:02 +0100 Subject: Add user locale setting --- app/mailers/notification_mailer.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'app/mailers/notification_mailer.rb') diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 33bea4c79..cf5ad3f92 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -8,7 +8,10 @@ class NotificationMailer < ApplicationMailer @status = status return unless @me.user.settings(:notification_emails).mention - mail to: @me.user.email, subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct) + + I18n.with_locale(@me.user.locale || I18n.default_locale) do + mail to: @me.user.email, subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct) + end end def follow(followed_account, follower) @@ -16,7 +19,10 @@ class NotificationMailer < ApplicationMailer @account = follower return unless @me.user.settings(:notification_emails).follow - mail to: @me.user.email, subject: I18n.t('notification_mailer.follow.subject', name: @account.acct) + + I18n.with_locale(@me.user.locale || I18n.default_locale) do + mail to: @me.user.email, subject: I18n.t('notification_mailer.follow.subject', name: @account.acct) + end end def favourite(target_status, from_account) @@ -25,7 +31,10 @@ class NotificationMailer < ApplicationMailer @status = target_status return unless @me.user.settings(:notification_emails).favourite - mail to: @me.user.email, subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct) + + I18n.with_locale(@me.user.locale || I18n.default_locale) do + mail to: @me.user.email, subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct) + end end def reblog(target_status, from_account) @@ -34,6 +43,9 @@ class NotificationMailer < ApplicationMailer @status = target_status return unless @me.user.settings(:notification_emails).reblog - mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct) + + I18n.with_locale(@me.user.locale || I18n.default_locale) do + mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct) + end end end -- cgit