Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FIX: use email prefix only in subject

Browse source
This commit is contained in:
Arpit Jalan 2017-03-21 18:41:15 +05:30
parent df246c79b6
commit 1853a4852c
4 changed files with 58 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/email/message_builder.rb
View file

@ -22,7 +22,8 @@ module Email
@opts = opts || {}
@template_args = {
site_name: SiteSetting.email_prefix.presence || SiteSetting.title,
site_name: SiteSetting.title,
email_prefix: SiteSetting.email_prefix.presence || SiteSetting.title,
base_url: Discourse.base_url,
user_preferences_url: "#{Discourse.base_url}/my/preferences",
hostname: Discourse.current_hostname,
@ -59,7 +60,7 @@ module Email
def subject
if @opts[:use_site_subject]
subject = String.new(SiteSetting.email_subject)
subject.gsub!("%{site_name}", @template_args[:site_name])
subject.gsub!("%{email_prefix}", @template_args[:email_prefix])
subject.gsub!("%{optional_re}", @opts[:add_re_to_subject] ? I18n.t('subject_re', @template_args) : '')
subject.gsub!("%{optional_pm}", @opts[:private_reply] ? I18n.t('subject_pm', @template_args) : '')
subject.gsub!("%{optional_cat}", @template_args[:show_category_in_subject] ? "[#{@template_args[:show_category_in_subject]}] " : '')