Merge remote-tracking branch 'upstream/pull/1926'

[rails.git] / app / views / notifier / message_notification.html.erb

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index 8c5fce74e7c060a8647cf352ba9bdfac27e5db61..d39ea40396be5b80a3f764f26890eaaef4e5c220 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,10 +1,20 @@
-<%= t'notifier.message_notification.hi', :to_user => @to_user %> 
+<p>
+  <%= t ".hi", :to_user => @to_user %>
+</p>
+<p>
+  <%= raw t ".header",
+            :from_user => link_to_user(@from_user),
+            :subject => content_tag("em", @title) %>
+</p>
 
-<%= t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
+<%= message_body do %>
+  <%= @text.to_html %>
+<% end %>
 
-==
-<%= @body %>
-==
-
-<%= t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= t'notifier.message_notification.footer2', :replyurl => @replyurl %>
+<% content_for :footer do %>
+  <p>
+    <%= t ".footer_html",
+          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :replyurl => link_to(@replyurl, @replyurl) %>
+  </p>
+<% end %>