github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-21 09:05:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Notifications shouldn't use user locale unless allow_user_locale is enabled

Browse Source
This commit is contained in:
Gerhard Schlager 2018-09-04 11:47:05 +02:00
parent d9be4f47e8
commit c788737eed
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/mailers/user_notifications.rb
View File

@ -20,10 +20,15 @@ class UserNotifications < ActionMailer::Base
end
def signup_after_approval(user, opts = {})
locale = user_locale(user)
tips = I18n.t('system_messages.usage_tips.text_body_template',
base_url: Discourse.base_url,
locale: locale)
build_email(user.email,
template: 'user_notifications.signup_after_approval',
locale: user_locale(user),
new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale))
locale: locale,
new_user_tips: tips)
end
def notify_old_email(user, opts = {})
@ -320,7 +325,7 @@ class UserNotifications < ActionMailer::Base
protected
def user_locale(user)
(user.locale.present? && I18n.available_locales.include?(user.locale.to_sym)) ? user.locale : nil
user.effective_locale
end
def email_post_markdown(post, add_posted_by = false)