Fix "lego" translation in message notification email

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index 0b2ff9e69480c2ddf54250a2177811f3ad37aa91..19704251d8041e309250888c63afe0ef933cee44 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -6,7 +6,4 @@
 <%= @text.to_html %>
 ==
 
 <%= @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 10a9ff361ea7d7d449d63b2858ca422a4ec3abcf..c006941d9ff63149b0379c7da05e77fe5b776cea 100644 (file)
--- 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 @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 715cef436a5c01113309d8d9f5c3506aeddb4063..7e4d15aaf5d30c2a1e2481c17e3f43eac03070b2 100644 (file)
--- 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}:"
       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."
     friend_notification:
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."