Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Give a pretty "from" address to the digest emails

This commit is contained in:
Robin Ward 2013-03-05 16:53:07 -05:00
parent ef47a55202
commit 030857ac8c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/mailers/user_notifications.rb
View File

@ -51,6 +51,7 @@ class UserNotifications < ActionMailer::Base
# Don't send email unless there is content in it # Don't send email unless there is content in it
if @new_topics.present? || @notifications.present? if @new_topics.present? || @notifications.present?
mail to: user.email, mail to: user.email,
from: "#{I18n.t('user_notifications.digest.from', site_name: SiteSetting.title)} <#{SiteSetting.notification_email}>",
subject: I18n.t('user_notifications.digest.subject_template', subject: I18n.t('user_notifications.digest.subject_template',
:site_name => @site_name, :site_name => @site_name,
:date => Time.now.strftime("%m-%d-%Y")) :date => Time.now.strftime("%m-%d-%Y"))

1
config/locales/server.en.yml
View File

@ -711,6 +711,7 @@ en:
new_topics: "New topics:" new_topics: "New topics:"
unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you in a while.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}." unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you in a while.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}."
click_here: "click here" click_here: "click here"
from: "%{site_name} digest"
private_message: private_message:
subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}" subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"