Revert to using join instead of to_sentence for now as to_sentence is

[rails.git] / app / views / trace / _trace_header.rhtml

diff --git a/app/views/trace/_trace_header.rhtml b/app/views/trace/_trace_header.rhtml
index b4ef3f61273c125b1396f65618173e696f47e4de..5be7269c2e0691d392e28c1ac355ff0f15cb7fca 100644 (file)
--- a/app/views/trace/_trace_header.rhtml
+++ b/app/views/trace/_trace_header.rhtml
@@ -1,24 +1,22 @@
 <h1><%= h(@title) %></h1>
 
+<% content_for :head do %>
 <%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>
+<% end %>
 
 <p>
   <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
   <% if @user.nil? or @display_name.nil? or @user.display_name != @display_name %>
-    | <%= link_to 'See just your traces, or upload a trace', :action => 'mine' %>
+    | <%= link_to t('trace.trace_header.see_just_your_traces'), :action => 'mine' %>
   <% end %>
   <% if @tag or @display_name %>
-    | <%= link_to 'See all traces', :controller => 'trace', :action => 'list' %>
+    | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list' %>
   <% end %>
   <% if @tag and @user and @user.display_name == @display_name %>
-    | <%= link_to 'See all your traces', :controller => 'trace', :action => 'mine' %>
+    | <%= link_to t('trace.trace_header.see_your_traces'), :controller => 'trace', :action => 'mine' %>
   <% end %>
 </p>
 
-<% if @user and @user.traces.count(:conditions => "inserted=0") > 4 %>
-  <p>
-    You have <%= @user.traces.count(:conditions => "inserted=0") %> traces 
-    waiting for upload. Please consider waiting for these to finish before 
-    uploading any more, so as not to block the queue for other users.
-  </p>
+<% if @user and @user.traces.count(:conditions => ["inserted=?", false]) > 4 %>
+  <p><%= t'trace.trace_header.traces_waiting', :count => @user.traces.count(:conditions => ["inserted=?", false]) %></p>
 <% end %>