X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c014618ef2037232945403b581a4eb76f95e64ab..46c76da1fecf6edeaf201f9cd03e43bb46f7c0b2:/app/views/diary_entry/edit.rhtml

diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.rhtml
index 41b9c8b20..46d107907 100644
--- 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>
@@ -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 %>;