X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3a599519eb49c2211bbb513fbbda65a05068b9e5..5294e4d989038ae20c1e38622d14f5b54c7d830f:/app/controllers/diary_entry_controller.rb diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 9ce5409d6..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] @@ -13,8 +13,6 @@ class DiaryEntryController < ApplicationController if params[:diary_entry] @diary_entry = DiaryEntry.new(params[:diary_entry]) @diary_entry.user = @user - @diary_entry.language = Language.find_by_code(params[:language]) - @diary_entry.language = Language.find_by_code("en") if @diary_entry.language.nil? if @diary_entry.save redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name @@ -22,6 +20,7 @@ class DiaryEntryController < ApplicationController render :action => 'edit' end else + @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language) render :action => 'edit' end end