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

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

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index f29dc30ffec2edce53a397ad78d0a51237c712bb..d408938e5ac8aafd8e49a700e13f66fe5d9c9ed1 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -12,32 +12,32 @@
   <div class="diary_entry standard-form">
     <fieldset>
       <div class='form-row'>
   <div class="diary_entry standard-form">
     <fieldset>
       <div class='form-row'>

-        <label class="standard-label"><%= t 'diary_entry.edit.subject' -%></label>
+        <label class="standard-label"><%= t '.subject' -%></label>

         <%= f.text_field :title, :class => "richtext_title" %>
       </div>
       <div class='form-row'>
         <%= f.text_field :title, :class => "richtext_title" %>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label>
+        <label class="standard-label"><%= t '.body' -%></label>

         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>
       <div class='form-row'>
         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label>
+        <label class="standard-label"><%= t '.language' -%></label>

         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>
     </fieldset>
     <fieldset class='location'>
         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>
     </fieldset>
     <fieldset class='location'>

-      <label class="standard-label"><%= t 'diary_entry.edit.location' -%></label>
+      <label class="standard-label"><%= t '.location' -%></label>

       <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
       <div class='form-row clearfix'>
         <div class='form-column'>
       <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
       <div class='form-row clearfix'>
         <div class='form-column'>

-          <label class="secondary standard-label"><%= t 'diary_entry.edit.latitude' -%></label>
+          <label class="secondary standard-label"><%= t '.latitude' -%></label>

           <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
         </div>
         <div class='form-column'>
           <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
         </div>
         <div class='form-column'>

-          <label class="secondary standard-label"><%= t 'diary_entry.edit.longitude' -%></label>
+          <label class="secondary standard-label"><%= t '.longitude' -%></label>

           <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
         </div>
         <div class='form-column'>
           <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
         </div>
         <div class='form-column'>

-          <a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
+          <a href="#" id="usemap"><%= t '.use_map_link' -%></a>

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


@@ -45,7 +45,7 @@
     <% if action_name == 'new' %>
       <%= submit_tag t('diary_entry.new.publish_button') %>
     <% else %>
     <% if action_name == 'new' %>
       <%= submit_tag t('diary_entry.new.publish_button') %>
     <% else %>

-      <%= submit_tag t('diary_entry.edit.save_button') %>
+      <%= submit_tag t('.save_button') %>

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