github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 11:18:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2523 from techAPJ/patch-3

Browse Source 
FIX: include topic title and domain name in topic invite mail
This commit is contained in:
Jeff Atwood 2014-07-09 21:38:17 -07:00
commit 0d9aacec24
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/mailers/invite_mailer.rb
View File

@ -24,6 +24,7 @@ class InviteMailer < ActionMailer::Base
build_email(invite.email,
template: 'invite_mailer',
invitee_name: invitee_name,
site_domain_name: Discourse.current_hostname,
invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
topic_title: first_topic.try(:title),
topic_excerpt: topic_excerpt,

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

@ -1048,7 +1048,7 @@ en:
blocked: "is blocked."
invite_mailer:
subject_template: "%{invitee_name} invited you to a discussion at %{site_name}"
subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
text_body_template: |
%{invitee_name} invited you to a discussion

8
spec/mailers/invite_mailer_spec.rb
View File

@ -42,6 +42,14 @@ describe InviteMailer do
expect(invite_mail.subject).to be_present
end
it 'renders topic title in subject' do
expect(invite_mail.subject).to match(topic.title)
end
it 'renders site domain name in subject' do
expect(invite_mail.subject).to match(Discourse.current_hostname)
end
it 'renders the body' do
expect(invite_mail.body).to be_present
end