From 0b08d461fa8d2e9e78aeb5fc5ed037415e901e29 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Mon, 1 Sep 2014 11:08:32 +0200
Subject: [PATCH] remove html escaping from all text mails

---
 app/views/mailer/feedback.text.haml                       | 4 ++--
 app/views/mailer/invite.text.haml                         | 4 ++--
 app/views/mailer/negative_balance.text.haml               | 2 +-
 app/views/mailer/not_enough_users_assigned.text.haml      | 2 +-
 app/views/mailer/upcoming_tasks.text.haml                 | 8 ++++----
 .../app/views/messages_mailer/foodsoft_message.text.haml  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/mailer/feedback.text.haml b/app/views/mailer/feedback.text.haml
index a63e2fdc..67bdfd0c 100644
--- a/app/views/mailer/feedback.text.haml
+++ b/app/views/mailer/feedback.text.haml
@@ -1,3 +1,3 @@
-= t '.header', user: show_user(@user), date: I18n.l(Time.now, :format => :short)
+= raw t '.header', user: show_user(@user), date: I18n.l(Time.now, :format => :short)
 \
-= @feedback
+= raw @feedback
diff --git a/app/views/mailer/invite.text.haml b/app/views/mailer/invite.text.haml
index e937b937..de5c8ffe 100644
--- a/app/views/mailer/invite.text.haml
+++ b/app/views/mailer/invite.text.haml
@@ -1,6 +1,6 @@
-= t '.text', user: @invite.user.name, mail: @invite.user.email, group: @invite.group.name, link: @link, expires: I18n.l(@invite.expires_at)
+= raw t '.text', user: @invite.user.name, mail: @invite.user.email, group: @invite.group.name, link: @link, expires: I18n.l(@invite.expires_at)
 -# append english text only if the locale is not english
 - if not I18n.locale.to_s.start_with?('en')
   =======
   \
-  = t '.text', user: @invite.user.name, mail: @invite.user.email, group: @invite.group.name, link: @link, expires: I18n.l(@invite.expires_at, locale: :en), locale: :en
+  = raw t '.text', user: @invite.user.name, mail: @invite.user.email, group: @invite.group.name, link: @link, expires: I18n.l(@invite.expires_at, locale: :en), locale: :en
diff --git a/app/views/mailer/negative_balance.text.haml b/app/views/mailer/negative_balance.text.haml
index f1a27a34..7d80e103 100644
--- a/app/views/mailer/negative_balance.text.haml
+++ b/app/views/mailer/negative_balance.text.haml
@@ -1 +1 @@
-= raw t '.text', group: h(@group.name), when: format_time(@transaction.created_on), balance: number_to_currency(@group.account_balance), amount: number_to_currency(@transaction.amount), note: h(@transaction.note), user: h(show_user(@transaction.user)), foodcoop: h(FoodsoftConfig[:name])
+= raw t '.text', group: @group.name, when: format_time(@transaction.created_on), balance: number_to_currency(@group.account_balance), amount: number_to_currency(@transaction.amount), note: @transaction.note, user: show_user(@transaction.user), foodcoop: FoodsoftConfig[:name]
diff --git a/app/views/mailer/not_enough_users_assigned.text.haml b/app/views/mailer/not_enough_users_assigned.text.haml
index 763fb411..941be442 100644
--- a/app/views/mailer/not_enough_users_assigned.text.haml
+++ b/app/views/mailer/not_enough_users_assigned.text.haml
@@ -1 +1 @@
-= t '.text', user: @user.first_name, task: @task.name, when: I18n.l(@task.due_date, format: t('mailer.dateformat')), workgroup_tasks_url: workgroup_tasks_url(workgroup_id: task.workgroup_id), user_tasks_url: user_tasks_url
+= raw t '.text', user: @user.first_name, task: @task.name, when: I18n.l(@task.due_date, format: t('mailer.dateformat')), workgroup_tasks_url: workgroup_tasks_url(workgroup_id: task.workgroup_id), user_tasks_url: user_tasks_url
diff --git a/app/views/mailer/upcoming_tasks.text.haml b/app/views/mailer/upcoming_tasks.text.haml
index 735aaf52..1f759d33 100644
--- a/app/views/mailer/upcoming_tasks.text.haml
+++ b/app/views/mailer/upcoming_tasks.text.haml
@@ -1,7 +1,7 @@
-= t '.text0', user: @user.name, task: @task.name, when: I18n.l(@task.due_date, format: t('mailer.dateformat'))
+= raw t '.text0', user: @user.name, task: @task.name, when: I18n.l(@task.due_date, format: t('mailer.dateformat'))
 - if @user.next_tasks.size > 0
-  = t '.nextweek'
+  = raw t '.nextweek'
   - for next_task in @user.next_tasks
     - next if next_task == @task
-    * #{I18n.l next_task.due_date, format: t('mailer.dateformat')} #{next_task.name}
-= t '.text1', user_tasks_url: user_tasks_url, foodcoop: FoodsoftConfig[:name]
+    * #{raw I18n.l next_task.due_date, format: t('mailer.dateformat')} #{raw next_task.name}
+= raw t '.text1', user_tasks_url: user_tasks_url, foodcoop: FoodsoftConfig[:name]
diff --git a/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml b/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml
index fd189ea5..953f335a 100644
--- a/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml
+++ b/lib/foodsoft_messages/app/views/messages_mailer/foodsoft_message.text.haml
@@ -1,4 +1,4 @@
-= @message.body
+= raw @message.body
 ======================================================================
 \
-= t '.footer', reply_url: new_message_url('message[reply_to]' => @message.id), msg_url: message_url(@message), profile_url: my_profile_url
+= raw t '.footer', reply_url: new_message_url('message[reply_to]' => @message.id), msg_url: message_url(@message), profile_url: my_profile_url