Merge branch 'master' into moderation

[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 d0b04de3f1eb8544475d6156986beaf380c5d212..80f9d8aa11b35a6e438f0b640bfb08bb8aec86df 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,7 +1,6 @@
 <p>
-  <%= t'notifier.changeset_comment_notification.hi', :to_user => @to_user %>
+  <%= t 'notifier.changeset_comment_notification.hi', :to_user => @to_user %>
 </p>
-
 <p>
   <% if @owner %>
     <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
@@ -15,16 +14,16 @@
   <% end %>
 </p>
 
-<%= render "notifier/user_message_table", :captured => capture { %>
+<%= message_body do %>
   <%= @comment.to_html %>
-<% } %>
+<% end %>
 
 <p>
-  <%= raw t 'notifier.changeset_comment_notification.details', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url)) %>
+  <%= raw t 'notifier.changeset_comment_notification.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 'notifier.changeset_comment_notification.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>
   </p>
 <% end %>