diff options
author | Jonne Haß <me@mrzyx.de> | 2013-08-24 19:52:01 +0400 |
---|---|---|
committer | Jonne Haß <me@mrzyx.de> | 2013-08-25 20:21:14 +0400 |
commit | 348a7b6c5b29839ff013f06966593d4b1a34c748 (patch) | |
tree | 8ea015782be8f9bbfbfc92fb4050b0ef9c5141f0 /app/mailers | |
parent | 0d1bf85931d66d4b0f2f63a0e2eca20c21f2f8fe (diff) |
update branding
Diffstat (limited to 'app/mailers')
4 files changed, 5 insertions, 5 deletions
diff --git a/app/mailers/notification_mailers/also_commented.rb b/app/mailers/notification_mailers/also_commented.rb index cb42fc4df..c0957e5aa 100644 --- a/app/mailers/notification_mailers/also_commented.rb +++ b/app/mailers/notification_mailers/also_commented.rb @@ -10,7 +10,7 @@ module NotificationMailers @comment = Comment.find_by_id(comment_id) if mail? - @headers[:from] = "\"#{@comment.author_name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>" + @headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>" @headers[:subject] = truncate(strip_markdown(@comment.comment_email_subject.squish), :length => TRUNCATION_LEN) @headers[:subject] = "Re: #{@headers[:subject]}" end diff --git a/app/mailers/notification_mailers/base.rb b/app/mailers/notification_mailers/base.rb index 980f70e51..06d21ad5d 100644 --- a/app/mailers/notification_mailers/base.rb +++ b/app/mailers/notification_mailers/base.rb @@ -3,7 +3,7 @@ module NotificationMailers class Base attr_accessor :recipient, :sender - + delegate :unconfirmed_email, :confirm_email_token, :first_name, to: :recipient, prefix: true delegate :first_name, :name, :sender, to: :sender, prefix: true @@ -38,7 +38,7 @@ module NotificationMailers :to => name_and_address(@recipient.name, @recipient.email) } - headers[:from] = "\"#{@sender.name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>" if @sender.present? + headers[:from] = "\"#{@sender.name} (diaspora*)\" <#{AppConfig.mail.sender_address}>" if @sender.present? headers end diff --git a/app/mailers/notification_mailers/comment_on_post.rb b/app/mailers/notification_mailers/comment_on_post.rb index 4eb5faec2..18faa2df7 100644 --- a/app/mailers/notification_mailers/comment_on_post.rb +++ b/app/mailers/notification_mailers/comment_on_post.rb @@ -8,7 +8,7 @@ module NotificationMailers def set_headers(comment_id) @comment = Comment.find(comment_id) - @headers[:from] = "\"#{@comment.author_name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>" + @headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>" @headers[:subject] = truncate(strip_markdown(@comment.comment_email_subject.squish), :length => TRUNCATION_LEN) @headers[:subject] = "Re: #{@headers[:subject]}" end diff --git a/app/mailers/notification_mailers/private_message.rb b/app/mailers/notification_mailers/private_message.rb index e39632b7d..6698ba647 100644 --- a/app/mailers/notification_mailers/private_message.rb +++ b/app/mailers/notification_mailers/private_message.rb @@ -7,7 +7,7 @@ module NotificationMailers @conversation = @message.conversation @participants = @conversation.participants - @headers[:from] = "\"#{@message.author_name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>" + @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 end |