X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5b3b288fc2c4dace76f5c6c60199cf434e2646b9..0e96027a209d59ff5e7f5c2b1405febc59664a16:/app/controllers/diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 96bf154a6..018f4a48a 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,8 +1,8 @@
 class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 
-  before_filter :set_locale
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user, :only => [:new, :edit]
   before_filter :check_database_readable
   before_filter :check_database_writable, :only => [:new, :edit]
@@ -20,7 +20,7 @@ class DiaryEntryController < ApplicationController
         render :action => 'edit'
       end
     else
-      @diary_entry = DiaryEntry.new(:language => @user.language)
+      @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language)
       render :action => 'edit'
     end
   end