Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...

[rails.git] / app / views / trace / edit.html.erb

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index 935862af4766ca30e9da188b227d97f56b528950..e890745ae18c1b867b74afaac4f6e691b4c9c064 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+  <h2><%= t '.heading', :name => h(@trace.name) %></h2>
 <% end %>
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
@@ -9,47 +9,47 @@
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.filename' %></label>
-      <p class='deemphasize'><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</p>
+      <label class='standard-label'><%= t '.filename' %></label>
+      <p class='deemphasize'><%= @trace.name %> (<%= link_to t('.download'), trace_data_path(@trace) %>)</p>
     </div>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.uploaded_at' %></label>
+      <label class='standard-label'><%= t '.uploaded_at' %></label>
       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>
   <% if @trace.inserted? %>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.points' %></label>
+      <label class='standard-label'><%= t '.points' %></label>
       <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></p>
     </div>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.start_coord' %></label>
+      <label class='standard-label'><%= t '.start_coord' %></label>
     </div>
     <div class="geo">
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>
-    (<%=link_to t('trace.edit.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
+    (<%=link_to t('.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
   <% end %>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.owner' %></label>
-      <p class='deemphasize'><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></p>
+      <label class='standard-label'><%= t '.owner' %></label>
+      <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
     </div>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.description' %></label>
+      <label class='standard-label'><%= t '.description' %></label>
       <%= f.text_field :description %>
     </div>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.tags' %></label>
-      <%= f.text_field :tagstring %> (<%= t'trace.edit.tags_help' %>)
+      <label class='standard-label'><%= t '.tags' %></label>
+      <%= f.text_field :tagstring %> (<%= t '.tags_help' %>)
     </div>
     <div class='form-row'>
-      <label class='standard-label'><%= t'trace.edit.visibility' %></label>
-      <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t'trace.edit.visibility_help_url' %>"><%= t'trace.edit.visibility_help' %></a>)
+      <label class='standard-label'><%= t '.visibility' %></label>
+      <%= f.select :visibility, [[t('trace.visibility.private'),"private"], [t('trace.visibility.public'),"public"], [t('trace.visibility.trackable'),"trackable"], [t('trace.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)
     </div>
   </fieldset>
 
 </div>
 
-<%= submit_tag t'trace.edit.save_button' %>
+<%= submit_tag t '.save_button' %>
 
 <% end %>