X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b5fd9f5fbe32f65a28e128deb1909d7c31237e85..82a6bb0d5afb3013a1a91a84e129ebd5a0e7dc5f:/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 67deff5e0..c2b552ed5 100644 --- a/app/views/notifier/changeset_comment_notification.html.erb +++ b/app/views/notifier/changeset_comment_notification.html.erb @@ -1,73 +1,26 @@ - -
-
-
|
- |||||||
- - <%= t 'notifier.changeset_comment_notification.unsubscribe_html', :url => @changeset_url %> - -- OpenStreetMap - - |
-
+ <% 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 %> +
+ +<%= message_body do %> + <%= @comment.to_html %> +<% end %> + ++ <%= raw t 'notifier.changeset_comment_notification.details', :url => link_to(@changeset_url, @changeset_url, :style => "white-space: nowrap") %> +
+ +<% content_for :footer do %> ++ <%= raw t 'notifier.changeset_comment_notification.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222; white-space: nowrap") %> +
+<% end %>