X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/14ac1babc2517320a2c90fa9b4ac36a5a6e68018..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/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 2a07032c3..3ecf3fdea 100644 --- a/app/views/notifier/changeset_comment_notification.html.erb +++ b/app/views/notifier/changeset_comment_notification.html.erb @@ -1,22 +1,29 @@ -
<%= t 'notifier.changeset_comment_notification.greeting' %>
- - ++ <%= t ".hi", :to_user => @to_user %> +
<% if @owner %> - <%= t "notifier.changeset_comment_notification.commented.your_changeset", :commenter => @commenter, :time => @time %> + <%= raw t ".commented.your_changeset", :commenter => link_to_user(@commenter), :time => @time %> <% else %> - <%= t "notifier.changeset_comment_notification.commented.commented_changeset", :commenter => @commenter, :time => @time, :changeset_author => @changeset_author %> + <%= raw t ".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", :changeset_comment => @changeset_comment %> + <%= raw t ".commented.partial_changeset_with_comment", :changeset_comment => content_tag("em", @changeset_comment) %> <% else %> - <%= t "notifier.changeset_comment_notification.commented.partial_changeset_without_comment" %> + <%= t ".commented.partial_changeset_without_comment" %> <% end %>
+<%= message_body do %> + <%= @comment.to_html %> +<% end %> -== -<%= @comment.to_html %> -== ++ <%= raw t ".details", :url => link_to(@changeset_url, @changeset_url) %> +
-<%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url) %>
+<% content_for :footer do %> ++ <%= raw t ".unsubscribe", :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %> +
+<% end %>