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

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

diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index 42d9f8ab27a1b051bcd5333f89f279d16a0bd504..fc6a9f1a9aeda4bc56a16df61a2be40f3e778e7a 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -1,33 +1,33 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.upload_trace' %></h1>
+  <h1><%= t ".upload_trace" %></h1>

 <% end %>
 
 <% end %>
 

-<%= error_messages_for 'trace' %>
+<%= error_messages_for "trace" %>

 
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
       <div class='form-row'>
 
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
       <div class='form-row'>

-        <label for="trace_gpx_file" class="standard-label"><%= t '.upload_gpx' %></label>
+        <label for="trace_gpx_file" class="standard-label"><%= t ".upload_gpx" %></label>

         <%= f.file_field :gpx_file %>
       </div>
       <div class='form-row'>
         <%= f.file_field :gpx_file %>
       </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>
+        <label class="standard-label"><%= t ".tags" %></label>

         <%= f.text_field :tagstring %>
         <%= f.text_field :tagstring %>

-        <span class="form-help deemphasize">(<%= t '.tags_help' %>)</span>
+        <span class="form-help deemphasize">(<%= t ".tags_help" %>)</span>

       </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"]] %>
-        <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
+        <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"]] %>
+        <span class="form-help deemphasize">(<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)</span>

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

-    <%= submit_tag t('.upload_button') %>
-    <span class="form-help deemphasize"><a href="<%= t '.help_url' %>"><%= t '.help' %></a></span>
+    <%= f.submit %>
+    <span class="form-help deemphasize"><a href="<%= t ".help_url" %>"><%= t ".help" %></a></span>

   </div>
 <% end %>
   </div>
 <% end %>