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

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

diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb
index 4e271cfb2b0aa9f7e349332247ed56a1bee86479..85cd87e5e093f1142647323922f10b3665a543ac 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,28 +1,29 @@
-<% content_for :body do %>
-  <p style="margin: 0">
-    <% if @owner %>
-      <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
-    <% else %>
-      <%= raw t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>
-    <% end %>
-    <% if @changeset_comment %>
-      <%= raw t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %>
-    <% else %>
-      <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %>
-    <% end %>
-  </p>
-
-  <%= render "notifier/user_message_table", :captured => capture { %>
-    <%= @comment.to_html %>
-  <% } %>
+<p>
+  <%= t ".hi", :to_user => @to_user %>
+</p>
+<p>
+  <% if @owner %>
+    <%= raw t ".commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
+  <% else %>
+    <%= raw t ".commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>
+  <% end %>
+  <% if @changeset_comment %>
+    <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => tag.em(@changeset_comment) %>
+  <% else %>
+    <%= t ".commented.partial_changeset_without_comment" %>
+  <% end %>
+</p>
 
-  <p>
-    <%= raw t 'notifier.changeset_comment_notification.details', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url)) %>
-  </p>
+<%= message_body do %>
+  <%= @comment.to_html %>
 <% end %>
 
+<p>
+  <%= raw t ".details", :url => link_to(@changeset_url, @changeset_url) %>
+</p>
+
 <% content_for :footer do %>
   <p>
-    <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url, :style => "color: #222")) %>
+    <%= raw t ".unsubscribe", :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>
   </p>
 <% end %>