</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>
<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>