Fix wrong translation key in nearby user list. Hopefully fixes #1885

[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..d5f6f59fc3ea6d99eefadb12d7c7e5578f961dbb 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 = I18n.t('diary_entry.list.new')

 
     if params[:diary_entry]     
       @diary_entry = DiaryEntry.new(params[:diary_entry])
 
     if params[:diary_entry]     
       @diary_entry = DiaryEntry.new(params[:diary_entry])


@@ -20,17 +20,20 @@ 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= I18n.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]
     @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
       if @diary_entry.update_attributes(params[:diary_entry])
         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
       end


@@ -67,7 +70,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 = I18n.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 +118,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 = "Users' diaries | #{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]