Merge branch 'master' into next

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

diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index 73bfe9a33d655b6c117cd3ddcb69e6cd2b53a758..163223b44584cbd2fe92df87b920db081cf85474 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,8 +1,8 @@
 <p>
 <p>

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

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

-  <%= raw t'notifier.diary_comment_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 => content_tag("em", @title) %>

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


@@ -10,7 +10,7 @@
 <% end %>
 
 <% content_for :footer do %>
 <% end %>
 
 <% content_for :footer do %>

-  <p><%= raw t'notifier.diary_comment_notification.footer',
+  <p><%= raw t '.footer',

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