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

FIX: customized email subjects was ignored for some notifications

Browse Source 
Email templates for notifications about new posts and topics weren't
using customized values.
This commit is contained in:
Neil Lalonde
2020-01-29 14:48:55 -05:00
parent 2ee6a615b7
commit 34f564acd6
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/email/message_builder.rb
View File

@ -51,7 +51,10 @@ module Email
end
def subject
if @opts[:use_site_subject]
if @opts[:template] &&
TranslationOverride.exists?(locale: I18n.locale, translation_key: "#{@opts[:template]}.subject_template")
subject = I18n.t("#{@opts[:template]}.subject_template", @template_args)
elsif @opts[:use_site_subject]
subject = String.new(SiteSetting.email_subject)
subject.gsub!("%{site_name}", @template_args[:email_prefix])
subject.gsub!("%{optional_re}", @opts[:add_re_to_subject] ? I18n.t('subject_re') : '')