X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03f733c4f4091dc53e391aa74a020681af98a4ff..6de8c2e6b30485683a9d3aa3e21c4b256fe399bd:/app/views/trace/_trace.html.erb?ds=sidebyside
diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 509c346ed..32717d824 100644
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -1,11 +1,11 @@
<% cl = cycle('table0', 'table1') %>
- <% if OSM_STATUS != :gpx_offline %>
+ <% if STATUS != :gpx_offline %>
<% if trace.inserted %>
<% else %>
- <%= t'trace.trace.pending' %>
+ <%= t'trace.trace.pending' %>
<% end %>
<% end %>
|
@@ -18,22 +18,14 @@
<%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> /
<%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> /
<%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
- <% if trace.visibility == "public" %>
- <%= t'trace.trace.public' %>
- <% elsif trace.visibility == "identifiable" %>
- <%= t'trace.trace.identifiable' %>
- <% elsif trace.visibility == "trackable" %>
- <%= t'trace.trace.trackable' %>
- <% else %>
- <%= t'trace.trace.private' %>
- <% end %>
+ <%= t('trace.trace.' + trace.visibility) %>
<%= h(trace.description) %>
<%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
<% if !trace.tags.empty? %>
<%= t'trace.trace.in' %>
- <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %>
+ <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
<% end %>