X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/94062a17b3e2ee1984b7bc2b744945d5aa7bf2e9..ac081305f24453b576d826f0b85a851e0e8506e2:/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 752f6c0f4..6bb1b6811 100644
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -11,7 +11,7 @@
             <tr>
               <td style="width: 30px; padding: 10px">
                 <a href="<%= @root_url %>" target="_blank">
-                  <%= image_tag attachments["osm_logo_30x30.png"].url, alt: "OpenStreetMap logo", title: "OpenStreetMap", height: "30", width: "30", border: "0" %>
+                  <%= image_tag attachments["logo.png"].url, alt: "OpenStreetMap logo", title: "OpenStreetMap", height: "30", width: "30", border: "0" %>
                 </a>
               </td>
               <td style="padding: 10px 0px">
@@ -27,28 +27,28 @@
                     <td style="text-align: left; padding: 15px 15px 5px 15px">
                       <p style="margin: 0">
                         <% if @owner %>
-                          <%= t "notifier.changeset_comment_notification.commented.your_changeset_html", :commenter => @commenter, :commenter_url => @commenter_url, :time => @time %>
+                          <%= raw t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %>
                         <% else %>
-                          <%= t "notifier.changeset_comment_notification.commented.commented_changeset_html", :commenter => @commenter, :commenter_url => @commenter_url, :time => @time, :changeset_author => @changeset_author %>
+                          <%= raw t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => link_to_user(@commenter), :time => @time, :changeset_author => @changeset_author %>
                         <% end %>
                         <% if @changeset_comment %>
-                          <%= t "notifier.changeset_comment_notification.commented.partial_changeset_with_comment_html", :changeset_comment => @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: 10px">
+                          <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: 10px">
+                          <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_html', :url => link_to(@changeset_url, @changeset_url) %>
+                        <%= raw t 'notifier.changeset_comment_notification.details', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url)) %>
                       </p>
                     </td>
                   </tr>
@@ -61,12 +61,10 @@
       <tr>
         <td style="text-align: center; font-size: 11px">
           <p>
-            To unsubscribe from updates to this changeset, visit
-            <nobr><a style="color: #222" href="<%= @changeset_url %>"><%= @changeset_url %></a></nobr>
-            and click 'Unsubscribe'
+            <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => content_tag("nobr", link_to(@changeset_url, @changeset_url, :style => "color: #222")) %>
           </p>
           <p style="margin-bottom: 10px">
-            <a href="https://www.openstreetmap.org/" target="_blank" style="color: #222">OpenStreetMap.org</a>
+            <a href="<%= @root_url %>" target="_blank" style="color: #222">OpenStreetMap</a>
           </p>
         </td>
       </tr>