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 a08f7182e4f6db138e7f9fe5394e5d776ae0e559..46d10790773e16c5b2521b11f92e7f198c8ad896 100644 (file)
--- a/app/views/diary_entry/edit.rhtml
+++ b/app/views/diary_entry/edit.rhtml
@@ -14,7 +14,7 @@
     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
-      <td><%= f.collection_select :language, Language.find(:all), :code, :name %></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>
@@ -28,7 +28,7 @@
     <tr>
       <td></td>
       <td>
-         <%= submit_tag t 'diary_entry.edit.save_button' %>
+         <%= submit_tag t('diary_entry.edit.save_button') %>
          <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
       </td>
     </tr>
@@ -53,6 +53,8 @@
   <!--
   var marker;
 
+  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+
   function init() {
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;