From cb49d1f4ea899c202d0f1fc75f481c31ce54bb9b Mon Sep 17 00:00:00 2001 From: Raphael Sofaer <raphael@joindiaspora.com> Date: Wed, 11 May 2011 17:02:05 -0700 Subject: [PATCH] fixed the formatting on emails --- app/views/notifier/liked.html.haml | 5 ++++- app/views/notifier/liked.text.haml | 4 +++- config/locales/diaspora/en.yml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/notifier/liked.html.haml b/app/views/notifier/liked.html.haml index a9b3bac35a..ca9300b729 100644 --- a/app/views/notifier/liked.html.haml +++ b/app/views/notifier/liked.html.haml @@ -2,7 +2,10 @@ = t('notifier.hello', :name => @receiver.profile.first_name) %p = t('.liked', :name => "#{@sender.name} (#{@sender.diaspora_handle})") - = @like.post.text + +%p + = @like.post.formatted_message(:plain_text => true) +%p %br = link_to t('.sign_in'), status_message_url(@like.post) diff --git a/app/views/notifier/liked.text.haml b/app/views/notifier/liked.text.haml index 754ff34fca..4b2a4e6429 100644 --- a/app/views/notifier/liked.text.haml +++ b/app/views/notifier/liked.text.haml @@ -1,6 +1,8 @@ != t('notifier.hello', :name => @receiver.profile.first_name) + != t('notifier.liked.liked', :name => "#{@sender.name} (#{@sender.diaspora_handle})") -!= @like.post.text + +!= @like.post.formatted_message(:plain_text => true) != t('notifier.love') != t('notifier.diaspora') diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 993bceeb3c..68dc49ff73 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -345,7 +345,7 @@ en: liked: subject: "%{name} has just liked your post" liked: "%{name} has just liked your post: " - sign_in: "Sign to view it" + sign_in: "Sign in to view it" people: zero: "no people" -- GitLab