X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3b6d2c5336eac35912909c9102c77bf6472901e6..8f8cbc4ae8c0b335a9f68c7749ad49a4a74e3e07:/app/views/diary_entry/edit.rhtml?ds=sidebyside

diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.rhtml
index 0a5203a66..41b9c8b20 100644
--- a/app/views/diary_entry/edit.rhtml
+++ b/app/views/diary_entry/edit.rhtml
@@ -1,26 +1,36 @@
+<h1><%= @title %></h1>
+
 <%= error_messages_for 'diary_entry' %>
 
 <% form_for :diary_entry do |f| %>
   <table>
     <tr valign="top">
-      <th>Subject</th>
+      <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td>
       <td><%= f.text_field :title, :size => 60 %></td>
     </tr>
     <tr valign="top">
-      <th>Body</th>
+      <td class="fieldName"><%= t 'diary_entry.edit.body' -%></td>
       <td><%= f.text_area :body, :cols => 80 %></td>
     </tr>
     <tr valign="top">
-      <th>Location</th>
+      <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
+      <td><%= f.collection_select :language, Language.find(:all), :code, :name %></td>
+    </tr>
+    <tr valign="top">
+      <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
       <td>
         <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px; display: none;"></div>
-        <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
-        <a href="javascript:openMap()" id="usemap">use map</a>
+        <span class="location"><%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
+        <a href="javascript:openMap()" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
+        <br/><br/>
       </td>
     </tr>
     <tr>
-      <th></th>
-      <td><%= submit_tag 'Save' %></td>
+      <td></td>
+      <td>
+	  <%= submit_tag t('diary_entry.edit.save_button') %>
+	  <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
+      </td>
     </tr>
   </table>
 <% end %>
@@ -66,7 +76,7 @@
       removeMarkerFromMap(marker);
     }
 
-    marker = addMarkerToMap(lonlat, null, "Diary entry location");
+    marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>");
   }
 
   function openMap() {