more trace i18n

diff --git a/app/views/trace/_trace_form.rhtml b/app/views/trace/_trace_form.rhtml
index 299845015c564e15743e5835f2213e189bcb7c31..9d9dd146ab3df4c50fbdbef6298258b80609a267 100644 (file)
--- a/app/views/trace/_trace_form.rhtml
+++ b/app/views/trace/_trace_form.rhtml
@@ -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 %>

diff --git a/app/views/trace/_trace_header.rhtml b/app/views/trace/_trace_header.rhtml
index cab6f7124504320d1eb19b8920bac3971b980e5b..5be7269c2e0691d392e28c1ac355ff0f15cb7fca 100644 (file)
--- a/app/views/trace/_trace_header.rhtml
+++ b/app/views/trace/_trace_header.rhtml
@@ -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 %>

diff --git a/app/views/trace/_trace_optionals.rhtml b/app/views/trace/_trace_optionals.rhtml
index b5b068fe60de4387287e30542cc7a479d6619b55..f166a779bb5b9b4ecaa68e81cb8530cee3f68002 100644 (file)
--- a/app/views/trace/_trace_optionals.rhtml
+++ b/app/views/trace/_trace_optionals.rhtml
@@ -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 %>

diff --git a/app/views/trace/no_such_user.rhtml b/app/views/trace/no_such_user.rhtml
index 7820b4847c6d260a232005a0eda5bcda52a2a930..46ff6c1b07e52f0654f4970f811519059952e736 100644 (file)
--- a/app/views/trace/no_such_user.rhtml
+++ b/app/views/trace/no_such_user.rhtml
@@ -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>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ee5bb1b76e9dd80bcbc7ebaeb7fe08c69ab995cd..3c25daa940bab846efcd20defaf2790959d01096 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -275,6 +275,22 @@ en:
       description: "Description:"
       tags: "Tags:"
       save_button: "Save Changes"
+    no_such_user:
+      no_such_user: "Sorry, there is no user with the name {{name}}. Please check your spelling, or maybe the link you clicked is wrong."
+    trace_form:
+      upload_gpx: "Upload GPX File"
+      description: "Description"
+      tags: "Tags"
+      public: "Public?"
+      upload_button: "Upload"
+      help: "Help"
+    trace_header:
+      see_just_your_traces: "See just your traces, or upload a trace"
+      see_all_traces: "See all traces"
+      see_your_traces: "See all your traces"
+      traces_waiting: "You have {{count}} 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."
+    trace_optionals:
+      tags: "Tags"
     view:
          pending: "PENDING"
          filename: "Filename:"