IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes broken "From" header in Private Message emails.

Browse Source
This commit is contained in:
Robin Ward 2013-03-01 14:56:52 -05:00
parent 7c68224763
commit 72cbb948b8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/mailers/user_notifications.rb
View File

@ -27,7 +27,8 @@ class UserNotifications < ActionMailer::Base
url: post.url, url: post.url,
subject_prefix: post.post_number != 1 ? "re: " : "", subject_prefix: post.post_number != 1 ? "re: " : "",
topic_title: post.topic.title, topic_title: post.topic.title,
from: post.user.name, private_message_from: post.user.name,
from: "#{I18n.t(:via, username: post.user.name, site_name: SiteSetting.title)} <#{SiteSetting.notification_email}>",
add_unsubscribe_link: true add_unsubscribe_link: true
end end

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

@ -708,7 +708,7 @@ en:
private_message: private_message:
subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}" subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"
text_body_template: | text_body_template: |
%{from} just sent you a private message %{private_message_from} just sent you a private message
--- ---
%{message} %{message}