Committing first of trace view i18n untested

diff --git a/app/views/trace/create.rhtml b/app/views/trace/create.rhtml
index 94f4039516d7e3914bc88a6f9ac4acf4a29604ed..59415dcd5bda063772e1aafca8e278782b2e33de 100644 (file)
--- a/app/views/trace/create.rhtml
+++ b/app/views/trace/create.rhtml
@@ -1,4 +1,4 @@
-<h1>Upload GPS Trace</h1>
+<h1><%= t'trace.create.upload_trace' %>Upload GPS Trace</h1>

 
 <%= error_messages_for 'trace' %>
 
 
 <%= error_messages_for 'trace' %>
 

diff --git a/app/views/trace/edit.rhtml b/app/views/trace/edit.rhtml
index d7c04182dbcebc636798eaaff4b8abd72b20cbff..397ee34a4b5bc46ea1541113bd0b68e3738582e8 100644 (file)
--- a/app/views/trace/edit.rhtml
+++ b/app/views/trace/edit.rhtml
@@ -6,28 +6,28 @@
 
 <table border="0">
   <tr>
 
 <table border="0">
   <tr>

-    <td>Filename:</td>
+    <td><%= t'trace.edit.filename' %></td>

     <td><%= @trace.name %> (<%= link_to 'download', :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
   </tr> 
   <tr>
     <td><%= @trace.name %> (<%= link_to 'download', :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
   </tr> 
   <tr>

-    <td>Uploaded at:</td>
+    <td><%= t'trace.edit.uploaded_at' %></td>

     <td><%= @trace.timestamp %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>
     <td><%= @trace.timestamp %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>

-    <td>Points:</td>
+    <td><%= t'trace.edit.points' %></td>

     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>

-    <td>Start coordinate:</td>
-    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>
+    <td><%= t'trace.edit.start_coord' %>Start coordinate:</td>
+    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>

   </tr>
   <% end %>
   <tr>
   </tr>
   <% end %>
   <tr>

-    <td>Owner:</td>
+    <td><%= t'trace.edit.owner' %></td>

     <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
   </tr>
   <tr>
     <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
   </tr>
   <tr>

-    <td>Description:</td>
+    <td><%= t'trace.edit.description' %>Description:</td>

     <td><%= f.text_field :description %></td>
   </tr>
   <tr>
     <td><%= f.text_field :description %></td>
   </tr>
   <tr>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c2fdf8832f4a7faafed6b335db7c874f9178579e..6b071b58b0abd8b5b53a3dbe7cb12593c6a38333 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -261,6 +261,19 @@ en:
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"

+  trace:
+    create:
+      upload: "Upload GPS Trace"
+    edit:
+      filename: "Filename:"
+      uploaded_at: "Uploaded at:"
+      points: "Points:"
+      start_coord: "Start coordinate:"
+      edit: "edit"
+      owner: "Owner:"
+      description: "Description:"
+      tags: "Tags:"
+      save_button: "Save Changes"

   user:
     login:
       heading: Login
   user:
     login:
       heading: Login