Prefer using _html locale keys to the raw function

[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 fceaf0147456ffe4c80627258f44947a9c0944e6..a694d55bb07b718cc3bf906388d45852aa1d29a4 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -1,25 +1,25 @@
-<h2><%= h(@title) %></h2>
+<h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>

 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 

-<% form_for :trace, @trace do |f| %>
+<%= form_for @trace, :url => { :action => "edit" } do |f| %>

 
 <table border="0">
   <tr>
     <td><%= t'trace.edit.filename' %></td>
 
 <table border="0">
   <tr>
     <td><%= t'trace.edit.filename' %></td>

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

   </tr> 
   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>
   </tr> 
   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>

-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>

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

-    <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>
+    <td><%= t'trace.edit.start_coord' %></td>
+    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.edit.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>


@@ -28,16 +28,20 @@
   </tr>
   <tr>
     <td><%= t'trace.edit.description' %></td>
   </tr>
   <tr>
     <td><%= t'trace.edit.description' %></td>

-    <td><%= f.text_field :description %></td>
+    <td><%= f.text_field :description, :size => 50 %></td>

   </tr>
   <tr>
   </tr>
   <tr>

-    <td>Tags:</td>
-    <td><%= f.text_field :tagstring %></td>
+    <td><%= t'trace.edit.tags' %></td>
+    <td><%= f.text_field :tagstring, :size => 50 %> (<%= t'trace.edit.tags_help' %>)</td>
+  </tr>
+  <tr>
+    <td><%= t'trace.edit.visibility' %></td>
+    <td><%= 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>)</td>

   </tr>
 </table>
 
 <br /><br />
 
   </tr>
 </table>
 
 <br /><br />
 

-<%= submit_tag 'Save Changes' %>
+<%= submit_tag t'trace.edit.save_button' %>

 
 <% end %>
 
 <% end %>