Move trace descriptions out of success/failure sentences in emails

[rails.git] / app / views / user_mailer / _gpx_description.text.erb

diff --git a/app/views/user_mailer/_gpx_description.text.erb b/app/views/user_mailer/_gpx_description.text.erb
index 6f7a9784452eba74a58d891591a33e62b1686c2b..f0ce97e61474d7051d6b16fde13444fb82a8323f 100644 (file)
--- a/app/views/user_mailer/_gpx_description.text.erb
+++ b/app/views/user_mailer/_gpx_description.text.erb
@@ -1,8 +1,14 @@
-<% trace_name = @trace_name %>
-<% trace_description = @trace_description %>
+<%= t ".details" %>
+
+<%= t ".filename" %>
+       <%= @trace_name %>
+<% if @trace_url %>
+<%= t ".url" %>
+       <%= @trace_url %>
+<% end %>
+<%= t ".description" %>
+       <%= @trace_description %>
 <% if @trace_tags.length > 0 %>
-  <% tags = @trace_tags.map { |trace_tag| trace_tag.tag }.join(", ") %>
-  <%= t ".description_with_tags", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
-<% else %>
-  <%= t ".description_with_no_tags", :trace_name => trace_name, :trace_description => trace_description %>
+<%= t ".tags" %>
+       <%= @trace_tags.map(&:tag).join(", ") %>
 <% end %>