From 030857ac8c3d047ec40733f8f626731b31896592 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 5 Mar 2013 16:53:07 -0500 Subject: [PATCH] Give a pretty "from" address to the digest emails --- app/mailers/user_notifications.rb | 1 + config/locales/server.en.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index ba40d7b40e8..22967bb6fbd 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -51,6 +51,7 @@ class UserNotifications < ActionMailer::Base # Don't send email unless there is content in it if @new_topics.present? || @notifications.present? 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', :site_name => @site_name, :date => Time.now.strftime("%m-%d-%Y")) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 58e37287f91..91956b106c6 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -711,6 +711,7 @@ en: 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}." click_here: "click here" + from: "%{site_name} digest" private_message: subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"