</tr>
<tr valign="top">
<td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
- <td><%= f.collection_select :language_code, Language.find(:all, :order => :english_name), :code, :name %></td>
+ <td><%= f.collection_select :language_code, Language.order(:english_name), :code, :name %></td>
</tr>
<tr valign="top">
<td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>