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

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

diff --git a/app/views/user_mailer/changeset_comment_notification.html.erb b/app/views/user_mailer/changeset_comment_notification.html.erb
index 85cd87e5e093f1142647323922f10b3665a543ac..efba71eb651d47a865a9b99059fbb347e8881fe2 100644 (file)
--- a/app/views/user_mailer/changeset_comment_notification.html.erb
+++ b/app/views/user_mailer/changeset_comment_notification.html.erb
@@ -3,12 +3,12 @@
 </p>
 <p>
   <% if @owner %>
 </p>
 <p>
   <% if @owner %>

-    <%= raw t ".commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
+    <%= t ".commented.your_changeset_html", :commenter => link_to_user(@commenter), :time => @time %>

   <% else %>
   <% else %>

-    <%= raw t ".commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>
+    <%= t ".commented.commented_changeset_html", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>

   <% end %>
   <% if @changeset_comment %>
   <% end %>
   <% if @changeset_comment %>

-    <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => tag.em(@changeset_comment) %>
+    <%= t ".commented.partial_changeset_with_comment_html", :changeset_comment => tag.em(@changeset_comment) %>

   <% else %>
     <%= t ".commented.partial_changeset_without_comment" %>
   <% end %>
   <% else %>
     <%= t ".commented.partial_changeset_without_comment" %>
   <% end %>


@@ -19,11 +19,11 @@
 <% end %>
 
 <p>
 <% end %>
 
 <p>

-  <%= raw t ".details", :url => link_to(@changeset_url, @changeset_url) %>
+  <%= t ".details_html", :url => link_to(@changeset_url, @changeset_url) %>

 </p>
 
 <% content_for :footer do %>
   <p>
 </p>
 
 <% content_for :footer do %>
   <p>

-    <%= raw t ".unsubscribe", :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>
+    <%= t ".unsubscribe_html", :url => link_to(@unsubscribe_url, @unsubscribe_url) %>

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