Merge remote-tracking branch 'openstreetmap/pull/1469'

[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 c49573bec8da201f681e0b5e53e643d40be2759d..f29dc30ffec2edce53a397ad78d0a51237c712bb 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -19,7 +19,7 @@
         <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label>
         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>
         <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label>
         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>

-      <div clas='form-row'>
+      <div class='form-row'>

         <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label>
         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>
         <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label>
         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>


@@ -42,7 +42,10 @@
       </div>
     </fieldset>
 
       </div>
     </fieldset>
 

-    <%= submit_tag t('diary_entry.edit.save_button') %>
-    <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
+    <% if action_name == 'new' %>
+      <%= submit_tag t('diary_entry.new.publish_button') %>
+    <% else %>
+      <%= submit_tag t('diary_entry.edit.save_button') %>
+    <% end %>

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