Added & cleaned up messages relating to a given user not existing

[rails.git] / app / views / diary_entry / edit.rhtml

diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.rhtml
index a69f4fd9c9240bc7a666099ac806678ade8032e9..46d10790773e16c5b2521b11f92e7f198c8ad896 100644 (file)
--- a/app/views/diary_entry/edit.rhtml
+++ b/app/views/diary_entry/edit.rhtml
@@ -5,26 +5,30 @@
 <% form_for :diary_entry do |f| %>
   <table>
     <tr valign="top">
-      <td class="fieldName">Subject:</td>
+      <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td>
       <td><%= f.text_field :title, :size => 60 %></td>
     </tr>
     <tr valign="top">
-      <td class="fieldName">Body:</td>
+      <td class="fieldName"><%= t 'diary_entry.edit.body' -%></td>
       <td><%= f.text_area :body, :cols => 80 %></td>
     </tr>
     <tr valign="top">
-      <td class="fieldName">Location:</td>
+      <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
+      <td><%= f.collection_select :language_code, Language.find(:all, :order => :english_name), :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>
       <td></td>
       <td>
-         <%= submit_tag 'Save' %>
+         <%= submit_tag t('diary_entry.edit.save_button') %>
          <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
       </td>
     </tr>
@@ -49,6 +53,8 @@
   <!--
   var marker;
 
+  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+
   function init() {
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
@@ -72,7 +78,7 @@
       removeMarkerFromMap(marker);
     }
 
-    marker = addMarkerToMap(lonlat, null, "Diary entry location");
+    marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>");
   }
 
   function openMap() {