Merge 17067 from trunk.

[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 d3601d47b70298d827a06eed0929e2b40b9f11be..690b4292b746e0a2aea89cfa7c12478f60b82c12 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -10,17 +10,26 @@ class DiaryEntryController < ApplicationController
   def new
     @title = t 'diary_entry.new.title'
 
-    if params[:diary_entry]     
+    if params[:diary_entry]
       @diary_entry = DiaryEntry.new(params[:diary_entry])
       @diary_entry.user = @user
 
-      if @diary_entry.save 
+      if @diary_entry.save
+        default_lang = @user.preferences.find(:first, :conditions => {:k => "diary.default_language"})
+        if default_lang
+          default_lang.v = @diary_entry.language_code
+          default_lang.save!
+        else
+          @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
+        end
         redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name 
       else
         render :action => 'edit'
       end
     else
-      @diary_entry = DiaryEntry.new(:language_code => @user.preferred_language)
+      default_lang = @user.preferences.find(:first, :conditions => {:k => "diary.default_language"})
+      lang_code = default_lang ? default_lang.v : @user.preferred_language
+      @diary_entry = DiaryEntry.new(:language_code => lang_code)
       render :action => 'edit'
     end
   end
@@ -45,7 +54,10 @@ class DiaryEntryController < ApplicationController
     @diary_comment = @entry.diary_comments.build(params[:diary_comment])
     @diary_comment.user = @user
     if @diary_comment.save
-      Notifier::deliver_diary_comment_notification(@diary_comment)
+      if @diary_comment.user != @entry.user
+        Notifier::deliver_diary_comment_notification(@diary_comment)
+      end
+
       redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
     else
       render :action => 'view'
@@ -91,8 +103,8 @@ class DiaryEntryController < ApplicationController
 
       if user
         @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20)
-        @title = "OpenStreetMap diary entries for #{user.display_name}"
-        @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
+        @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name)
+        @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         render :nothing => true, :status => :not_found
@@ -101,15 +113,15 @@ class DiaryEntryController < ApplicationController
       @entries = DiaryEntry.find(:all, :include => :user,
         :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
         :order => 'created_at DESC', :limit => 20)
-      @title = "OpenStreetMap diary entries in #{Language.find(params[:language]).english_name}"
-      @description = "Recent diary entries from users of OpenStreetMap in #{Language.find(params[:language]).english_name}"
+      @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
+      @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],
                                  :order => 'created_at DESC', :limit => 20)
-      @title = "OpenStreetMap diary entries"
-      @description = "Recent diary entries from users of OpenStreetMap"
+      @title = I18n.t('diary_entry.feed.all.title')
+      @description = I18n.t('diary_entry.feed.all.description')
       @link = "http://#{SERVER_URL}/diary"
     end
   end
@@ -122,6 +134,7 @@ class DiaryEntryController < ApplicationController
       if @entry
         @title = t 'diary_entry.view.title', :user => params[:display_name]
       else
+        @title = t 'diary_entry.no_such_entry.title', :id => params[:id]
         render :action => 'no_such_entry', :status => :not_found
       end
     else