uptodate with en.yml 15663

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 9fad57c02522b44227ad4759c08e4418e2bbbfc3..46986acb4c223023a9f7ce4febf2946216639ef0 100644 (file)
--- 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
 
 class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 

-  before_filter :set_locale

   before_filter :authorize_web
   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
   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])
 
     if params[:diary_entry]     
       @diary_entry = DiaryEntry.new(params[:diary_entry])


@@ -20,12 +20,13 @@ class DiaryEntryController < ApplicationController
         render :action => 'edit'
       end
     else
         render :action => 'edit'
       end
     else

+      @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language)

       render :action => 'edit'
     end
   end
 
   def edit
       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
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user


@@ -56,7 +57,7 @@ class DiaryEntryController < ApplicationController
       @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
       if @this_user
       @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',
         @entry_pages, @entries = paginate(:diary_entries,
                                           :conditions => ['user_id = ?', @this_user.id],
                                           :order => 'created_at DESC',


@@ -67,7 +68,7 @@ class DiaryEntryController < ApplicationController
         render :action => 'no_such_user', :status => :not_found
       end
     else
         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',
       @entry_pages, @entries = paginate(:diary_entries, :include => :user,
                                         :conditions => ["users.visible = ?", true],
                                         :order => 'created_at DESC',


@@ -115,7 +116,11 @@ class DiaryEntryController < ApplicationController
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])

-      @title = "Users' diaries | #{params[:display_name]}"
+      if @entry
+        @title = t 'diary_entry.view.title', :user => params[:display_name]
+      else
+        render :action => 'no_such_entry', :status => :not_found
+      end

     else
       @not_found_user = params[:display_name]
 
     else
       @not_found_user = params[:display_name]