From 62a5e65a8713373bb0e4c6ebe79c2e1bcd06b9ea Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 28 Jul 2013 12:38:28 +0100
Subject: [PATCH] Fix "lego" translation in message notification email

---
 app/views/notifier/message_notification.html.erb | 5 +----
 app/views/notifier/message_notification.text.erb | 3 +--
 config/locales/en.yml                            | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index 0b2ff9e69..19704251d 100644
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -6,7 +6,4 @@
 <%= @text.to_html %>
 ==
 
-<p>
-  <%= raw t'notifier.message_notification.footer1', :readurl => link_to(@readurl, @readurl) %>
-  <%= raw t'notifier.message_notification.footer2', :replyurl => link_to(@replyurl, @replyurl) %>
-</p>
+<p><%= t'notifier.message_notification.footer_html', :readurl => link_to(@readurl, @readurl), :replyurl => link_to(@replyurl, @replyurl) %></p>
diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb
index 10a9ff361..c006941d9 100644
--- a/app/views/notifier/message_notification.text.erb
+++ b/app/views/notifier/message_notification.text.erb
@@ -6,5 +6,4 @@
 <%= raw @text.to_text %>
 ==
 
-<%= raw t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= raw t'notifier.message_notification.footer2', :replyurl => @replyurl %>
+<%= word_wrap(t'notifier.message_notification.footer_html', :readurl => @readurl, :replyurl => @replyurl) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 715cef436..7e4d15aaf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1147,8 +1147,7 @@ en:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
-      footer1: "You can also read the message at %{readurl}"
-      footer2: "and you can reply at %{replyurl}"
+      footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
-- 
2.43.2