Merge remote-tracking branch 'upstream/pull/2473'

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

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 6657a33adc53b3a38ff7c93cbba006a30f12cd3e..2deae8ac2bbe82e1a1ca5ae27e8a5b528fd700e0 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -1,55 +1,55 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t '.heading', :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => h(@trace.name) %></h2>

 <% end %>
 
 <% end %>
 

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

 
 

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

 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>
 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.filename' %></label>
-      <p class='deemphasize'><%= @trace.name %> (<%= link_to t('.download'), trace_data_path(@trace) %>)</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'>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.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'>
       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>
   <% if @trace.inserted? %>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.points' %></label>
-      <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></p>
+      <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'>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.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>
     </div>
     <div class="geo">
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>

-    (<%=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}" %>)
+    (<%= 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'>
   <% end %>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.owner' %></label>
+      <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'>
       <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 '.description' %></label>
+      <label class='standard-label'><%= t ".description" %></label>

       <%= f.text_field :description %>
     </div>
     <div class='form-row'>
       <%= f.text_field :description %>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.tags' %></label>
-      <%= f.text_field :tagstring %> (<%= t '.tags_help' %>)
+      <label class='standard-label'><%= t ".tags" %></label>
+      <%= f.text_field :tagstring %> (<%= t ".tags_help" %>)

     </div>
     <div class='form-row'>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.visibility' %></label>
-      <%= f.select :visibility, [[t('traces.visibility.private'),"private"], [t('traces.visibility.public'),"public"], [t('traces.visibility.trackable'),"trackable"], [t('traces.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)
+      <label class='standard-label'><%= t ".visibility" %></label>
+      <%= f.select :visibility, [[t("traces.visibility.private"), "private"], [t("traces.visibility.public"), "public"], [t("traces.visibility.trackable"), "trackable"], [t("traces.visibility.identifiable"), "identifiable"]] %> (<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)

     </div>
   </fieldset>
 
 </div>
 
     </div>
   </fieldset>
 
 </div>
 

-<%= submit_tag t '.save_button' %>
+<%= f.submit %>

 
 <% end %>
 
 <% end %>