From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Aug 2015 20:44:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/903'
X-Git-Tag: live~5107
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2?hp=db7374f2bbdd0b3ee0f3cb0a9cca84f9c72cffb5

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

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 4021eaa4d..f29dc30ff 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -42,7 +42,10 @@
       </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 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 63f0c0e78..07647af22 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -250,6 +250,7 @@ en:
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: "Publish"
     list:
       title: "Users' diaries"
       title_friends: "Friends' diaries"