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

[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 97a352a499e7f51385c620f90385762d6097f90e..74d10f599be967370ce81ea41afc9eb34edeb1f4 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,11 +1,10 @@
 <p>
 <p>

-  <%= t'notifier.message_notification.hi', :to_user => @to_user %>
+  <%= t ".hi", :to_user => @to_user %>

 </p>
 <p>
 </p>
 <p>

-  <%= raw t'notifier.message_notification.header',
-          :from_user => link_to_user(@from_user),
-          :subject => content_tag("em", @title)
-  %>
+  <%= raw t ".header",
+            :from_user => link_to_user(@from_user),
+            :subject => tag.em(@title) %>

 </p>
 
 <%= message_body do %>
 </p>
 
 <%= message_body do %>


@@ -14,9 +13,8 @@
 
 <% content_for :footer do %>
   <p>
 
 <% content_for :footer do %>
   <p>

-    <%= t'notifier.message_notification.footer_html',
+    <%= t ".footer_html",

           :readurl => link_to(@readurl, @readurl) + tag(:br),
           :readurl => link_to(@readurl, @readurl) + tag(:br),

-          :replyurl => link_to(@replyurl, @replyurl)
-    %>
+          :replyurl => link_to(@replyurl, @replyurl) %>

   </p>
 <% end %>
   </p>
 <% end %>