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

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 96bf154a6..46986acb4 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,14 +1,14 @@
 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 = t 'diary_entry.new.title'
 
     if params[:diary_entry]     
       @diary_entry = DiaryEntry.new(params[:diary_entry])
@@ -20,20 +20,18 @@ 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
 
   def edit
-    @title= 'Edit diary entry'
+    @title= t 'diary_entry.edit.title'
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user
       redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
     elsif params[:diary_entry]
-      params[:diary_entry][:language] = Language.find_by_code(params[:diary_entry][:language])
-      params[:diary_entry][:language] = Language.find_by_code("en") if params[:diary_entry][:language].nil?
       if @diary_entry.update_attributes(params[:diary_entry])
         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
       end
@@ -59,7 +57,7 @@ class DiaryEntryController < ApplicationController
       @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
       if @this_user
-        @title = @this_user.display_name + "'s diary"
+        @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
         @entry_pages, @entries = paginate(:diary_entries,
                                           :conditions => ['user_id = ?', @this_user.id],
                                           :order => 'created_at DESC',
@@ -70,7 +68,7 @@ class DiaryEntryController < ApplicationController
         render :action => 'no_such_user', :status => :not_found
       end
     else
-      @title = "Users' diaries"
+      @title = t 'diary_entry.list.title'
       @entry_pages, @entries = paginate(:diary_entries, :include => :user,
                                         :conditions => ["users.visible = ?", true],
                                         :order => 'created_at DESC',
@@ -119,7 +117,7 @@ class DiaryEntryController < ApplicationController
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])
       if @entry
-        @title = "Users' diaries | #{params[:display_name]}"
+        @title = t 'diary_entry.view.title', :user => params[:display_name]
       else
         render :action => 'no_such_entry', :status => :not_found
       end