Improve "no traces" message

diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index 3003df98a58d661a2c9651e7efa03f396759b915..5a33defc8af659c4c818fb06ffaa08ba42ddf86c 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -33,7 +33,7 @@
 
   <%= render :partial => 'trace_paging_nav' %>
 <% else %>
 
   <%= render :partial => 'trace_paging_nav' %>
 <% else %>

-  <%= t 'trace.list.empty_html', :upload_link => link_to(t('trace.list.upload_new'), trace_create_path) %>
+  <p><%= t 'trace.list.empty_html', :upload_link => trace_create_path %></p>

 <% end %>
 
 <%= render :partial => 'trace_optionals' %>
 <% end %>
 
 <%= render :partial => 'trace_optionals' %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 354fcb04ca1171798843efe2f06c6a9a8bec9809..ca16c1a5e95ec215f767416aeb904cbdc5ea38bb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1513,8 +1513,7 @@ en:
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       tagged_with: " tagged with %{tags}"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       tagged_with: " tagged with %{tags}"

-      empty_html: "Nothing here yet. %{upload_link} Or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
-      upload_new: "Upload a new trace"
+      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."

     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public: