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

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

diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb
index 0bc1bcde11e458999147d74f75c17992da906d42..7e1af7862ccf37f16aa6556ed8dbf06ddf3c92c6 100644 (file)
--- a/app/views/trace/create.html.erb
+++ b/app/views/trace/create.html.erb
@@ -8,26 +8,26 @@
   <div class="standard-form">
     <fieldset>
       <div class='form-row'>
   <div class="standard-form">
     <fieldset>
       <div class='form-row'>

-        <label for="trace_gpx_file" class="standard-label"><%= t'trace.trace_form.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'trace.trace_form.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'trace.trace_form.tags' %></label>
+        <label class="standard-label"><%= t '.tags' %></label>

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

-        <span class="form-help deemphasize">(<%= t'trace.trace_form.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'trace.trace_form.visibility' %></label>
+        <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"]] %>
         <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %>

-        <span class="form-help deemphasize">(<a href="<%= t'trace.trace_form.visibility_help_url' %>"><%= t'trace.trace_form.visibility_help' %></a>)</span>
+        <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>

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

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

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