Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaiVardhan <saimca03@gmail.com>2016-07-08 13:33:52 +0300
committerSaiVardhan <saimca03@gmail.com>2016-07-12 14:03:15 +0300
commit274104aac6e357033bdbff2677e203e48e96be12 (patch)
treec5add95b7c6d99816b742270852f64b9ffe7af94 /app/mailers
parent053f69b67c0a84fd14ccecfd5bab827d3044cff1 (diff)
issue-6850 Don't include subjects of private messages in email notifications
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/notification_mailers/private_message.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/mailers/notification_mailers/private_message.rb b/app/mailers/notification_mailers/private_message.rb
index 6698ba647..ed40e70dd 100644
--- a/app/mailers/notification_mailers/private_message.rb
+++ b/app/mailers/notification_mailers/private_message.rb
@@ -8,8 +8,7 @@ module NotificationMailers
@participants = @conversation.participants
@headers[:from] = "\"#{@message.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
- @headers[:subject] = @conversation.subject.strip
- @headers[:subject] = "Re: #{@headers[:subject]}" if @conversation.messages.size > 1
+ @headers[:subject] = I18n.t("notifier.private_message.subject")
end
end
end