From 5f841b9addfd8d62b89301ccf279d6aad5047f98 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Tue, 8 Mar 2011 20:45:02 +0100 Subject: [PATCH] do not escape html in text only emails --- app/views/notifier/also_commented.text.haml | 12 ++++++------ app/views/notifier/comment_on_post.text.haml | 12 ++++++------ app/views/notifier/mentioned.text.haml | 12 ++++++------ app/views/notifier/new_request.text.haml | 14 +++++++------- app/views/notifier/request_accepted.text.haml | 14 +++++++------- app/views/notifier/single_admin.text.haml | 8 ++++---- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/views/notifier/also_commented.text.haml b/app/views/notifier/also_commented.text.haml index 193b348f1..58d304bb3 100644 --- a/app/views/notifier/also_commented.text.haml +++ b/app/views/notifier/also_commented.text.haml @@ -1,8 +1,8 @@ -= t('notifier.hello', :name => @receiver.profile.first_name) -= "#{@sender.name} (#{@sender.diaspora_handle})" -= t('notifier.also_commented.commented', :post_author => @post_author_name) +!= t('notifier.hello', :name => @receiver.profile.first_name) +!= "#{@sender.name} (#{@sender.diaspora_handle})" +!= t('notifier.also_commented.commented', :post_author => @post_author_name) -= @comment.text +!= @comment.text -= "#{t('notifier.love')} \n" -= t('notifier.diaspora') +!= "#{t('notifier.love')} \n" +!= t('notifier.diaspora') diff --git a/app/views/notifier/comment_on_post.text.haml b/app/views/notifier/comment_on_post.text.haml index ae94e8f0e..72a96c847 100644 --- a/app/views/notifier/comment_on_post.text.haml +++ b/app/views/notifier/comment_on_post.text.haml @@ -1,8 +1,8 @@ -= t('notifier.hello', :name => @receiver.profile.first_name) -= "#{@sender.name} (#{@sender.diaspora_handle})" -= t('notifier.comment_on_post.commented') +!= t('notifier.hello', :name => @receiver.profile.first_name) +!= "#{@sender.name} (#{@sender.diaspora_handle})" +!= t('notifier.comment_on_post.commented') -= @comment.text +!= @comment.text -= "#{t('notifier.love')} \n" -= t('notifier.diaspora') +!= "#{t('notifier.love')} \n" +!= t('notifier.diaspora') diff --git a/app/views/notifier/mentioned.text.haml b/app/views/notifier/mentioned.text.haml index eb4ec1709..86cdce64f 100644 --- a/app/views/notifier/mentioned.text.haml +++ b/app/views/notifier/mentioned.text.haml @@ -1,8 +1,8 @@ -= t('notifier.hello', :name => @receiver.profile.first_name) -= "#{@sender.name} (#{@sender.diaspora_handle})" -= t('notifier.mentioned.mentioned') +!= t('notifier.hello', :name => @receiver.profile.first_name) +!= "#{@sender.name} (#{@sender.diaspora_handle})" +!= t('notifier.mentioned.mentioned') -= @post.formatted_message(:plain_text => true) +!= @post.formatted_message(:plain_text => true) -= "#{t('notifier.love')} \n" -= t('notifier.diaspora') +!= "#{t('notifier.love')} \n" +!= t('notifier.diaspora') diff --git a/app/views/notifier/new_request.text.haml b/app/views/notifier/new_request.text.haml index dfef1ff17..43d392b91 100644 --- a/app/views/notifier/new_request.text.haml +++ b/app/views/notifier/new_request.text.haml @@ -1,9 +1,9 @@ -= t('notifier.hello', :name => @receiver.profile.first_name) -= "#{@sender.name} (#{@sender.diaspora_handle})" -= t('notifier.new_request.just_sent_you') -= t('notifier.new_request.try_it_out') +!= t('notifier.hello', :name => @receiver.profile.first_name) +!= "#{@sender.name} (#{@sender.diaspora_handle})" +!= t('notifier.new_request.just_sent_you') +!= t('notifier.new_request.try_it_out') -= "#{t('notifier.new_request.sign_in')}: #{new_user_session_url}" +!= "#{t('notifier.new_request.sign_in')}: #{new_user_session_url}" -= t('notifier.love') -= t('notifier.diaspora') +!= t('notifier.love') +!= t('notifier.diaspora') diff --git a/app/views/notifier/request_accepted.text.haml b/app/views/notifier/request_accepted.text.haml index 6404d97ce..44843cca3 100644 --- a/app/views/notifier/request_accepted.text.haml +++ b/app/views/notifier/request_accepted.text.haml @@ -1,8 +1,8 @@ -= t('notifier.hello', :name => @receiver.profile.first_name) -= "#{@sender.name} (#{@sender.diaspora_handle})" -= t('notifier.request_accepted.accepted') +!= t('notifier.hello', :name => @receiver.profile.first_name) +!= "#{@sender.name} (#{@sender.diaspora_handle})" +!= t('notifier.request_accepted.accepted') -= t('.sign_in') -= new_user_session_url -= "#{t('notifier.love')} \n" -= t('notifier.diaspora') +!= t('.sign_in') +!= new_user_session_url +!= "#{t('notifier.love')} \n" +!= t('notifier.diaspora') diff --git a/app/views/notifier/single_admin.text.haml b/app/views/notifier/single_admin.text.haml index d2ec82da9..ec60ca115 100644 --- a/app/views/notifier/single_admin.text.haml +++ b/app/views/notifier/single_admin.text.haml @@ -1,6 +1,6 @@ -= t('notifier.hello', :name => @recipient.username) +!= t('notifier.hello', :name => @recipient.username) -= @string +!= @string -= t('notifier.thanks') -= t('notifier.single_admin.admin') +!= t('notifier.thanks') +!= t('notifier.single_admin.admin')