X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/479a4bd0d7f9e3ece258634475fdc47f863c5c19..d593d3d2dd6986aa07f5d5268d3e0d7b808590db:/app/views/notifier/changeset_comment_notification.html.erb?ds=sidebyside

diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb
index 344a4e33d..04bafb0d4 100644
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,33 +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>
-  <table style="font-size: 15px; font-style: italic; margin: 15px; background-color: #eee; width: 520px">
-    <tr>
-      <td style="width: 50px; vertical-align: top; padding: 15px">
-        <a href="<%= @commenter_url %>" target="_blank"><%= image_tag attachments["avatar.png"].url, alt: @commenter %></a>
-      </td>
-      <td style="text-align: left; vertical-align: top; padding-right: 10px">
-        <%= @comment.to_html %>
-      </td>
-    </tr>
-  </table>
-  <p>
-    <%= raw t 'notifier.changeset_comment_notification.details', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url)) %>
-  </p>
+<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 => content_tag("em", @changeset_comment) %>
+  <% else %>
+    <%= t ".commented.partial_changeset_without_comment" %>
+  <% end %>
+</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 %>