X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3a599519eb49c2211bbb513fbbda65a05068b9e5..207f257d1280485582e401bf5c8acdb41b212b97:/app/controllers/diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 9ce5409d6..d5f6f59fc 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,20 +1,18 @@
 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]
 
   def new
-    @title = 'New diary entry'
+    @title = I18n.t('diary_entry.list.new')
 
     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,12 +20,13 @@ class DiaryEntryController < ApplicationController
         render :action => 'edit'
       end
     else
+      @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language)
       render :action => 'edit'
     end
   end
 
   def edit
-    @title= 'Edit diary entry'
+    @title= I18n.t('diary_entry.edit.title')
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user
@@ -71,7 +70,7 @@ class DiaryEntryController < ApplicationController
         render :action => 'no_such_user', :status => :not_found
       end
     else
-      @title = "Users' diaries"
+      @title = I18n.t('diary_entry.list.title')
       @entry_pages, @entries = paginate(:diary_entries, :include => :user,
                                         :conditions => ["users.visible = ?", true],
                                         :order => 'created_at DESC',