more trace i18n

This commit is contained in:
Andy Allan 2009-05-31 14:25:19 +00:00
parent ec9deb5dc2
commit c30f141f4b
5 changed files with 27 additions and 15 deletions

View file

@ -1,9 +1,9 @@
<% form_for :trace, @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
<table>
<tr><td align="right">Upload GPX File</td><td><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %></td></tr>
<tr><td align="right">Description</td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
<tr><td align="right">Tags</td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
<tr><td align="right">Public?</td><td><%= f.check_box :public %></td></tr>
<tr><td></td><td><%= submit_tag 'Upload' %> | <a href="http://wiki.openstreetmap.org/index.php/Upload">Help</a></td></tr>
<tr><td align="right"><%= t'trace.trace_form.upload_gpx' %></td><td><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %></td></tr>
<tr><td align="right"><%= t'trace.trace_form.description' %></td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
<tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
<tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %></td></tr>
<tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="http://wiki.openstreetmap.org/index.php/Upload"><%= t'trace.trace_form.help' %></a></td></tr>
</table>
<% end %>

View file

@ -7,20 +7,16 @@
<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=?", false]) > 4 %>
<p>
You have <%= @user.traces.count(:conditions => ["inserted=?", false]) %> 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>
<p><%= t'trace.trace_header.traces_waiting', :count => @user.traces.count(:conditions => ["inserted=?", false]) %></p>
<% end %>

View file

@ -1,6 +1,6 @@
<% content_for "optionals" do %>
<div class="optionalbox">
<span class="oboxheader">Tags</span>
<span class="oboxheader"><%= t'trace.trace_optionals.tags' %></span>
<br />
<br />
<% if @all_tags %>

View file

@ -1,2 +1,2 @@
<h2><%= h(@not_found_user) %></h2>
<p>Sorry, there is no user with the name <%= @not_found_user -%>. Please check your spelling, or maybe the link you clicked is wrong.</p>
<p><%= t'trace.no_such_user.no_such_user', :name => @not_found_user %></p>