Merge 16012:16110 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 388df43fe6dc161c2eacee0e22d242e0e15b325f..7a442ac58a3744a4656b0d0498d874feb946d838 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'
 
   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
 
       @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
         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
       render :action => 'edit'
     end
   end


@@ -32,8 +41,6 @@ class DiaryEntryController < ApplicationController
     if @user != @diary_entry.user
       redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
     elsif params[:diary_entry]
     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


@@ -65,10 +72,17 @@ class DiaryEntryController < ApplicationController
                                           :order => 'created_at DESC',
                                           :per_page => 20)
       else
                                           :order => 'created_at DESC',
                                           :per_page => 20)
       else

+        @title = t'diary_entry.no_such_user.title'

         @not_found_user = params[:display_name]
 
         render :action => 'no_such_user', :status => :not_found
       end
         @not_found_user = params[:display_name]
 
         render :action => 'no_such_user', :status => :not_found
       end

+    elsif params[:language]
+      @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
+                                        :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
+                                        :order => 'created_at DESC',
+                                        :per_page => 20)

     else
       @title = t 'diary_entry.list.title'
       @entry_pages, @entries = paginate(:diary_entries, :include => :user,
     else
       @title = t 'diary_entry.list.title'
       @entry_pages, @entries = paginate(:diary_entries, :include => :user,


@@ -79,6 +93,8 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
   end
 
   def rss

+    request.format = :rss
+

     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 


@@ -87,20 +103,16 @@ class DiaryEntryController < ApplicationController
         @title = "OpenStreetMap diary entries for #{user.display_name}"
         @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
         @title = "OpenStreetMap diary entries for #{user.display_name}"
         @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"

-
-        render :content_type => Mime::RSS

       else
         render :nothing => true, :status => :not_found
       end
     elsif params[:language]
       @entries = DiaryEntry.find(:all, :include => :user,
       else
         render :nothing => true, :status => :not_found
       end
     elsif params[:language]
       @entries = DiaryEntry.find(:all, :include => :user,

-        :conditions => ["users.visible = ? AND diary_entries.language = ?", true, params[:language]],
+        :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],

         :order => 'created_at DESC', :limit => 20)
         :order => 'created_at DESC', :limit => 20)

-      @title = "OpenStreetMap diary entries in #{params[:language]}"
-      @description = "Recent diary entries from users of OpenStreetMap"
+      @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}"

       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"

-      
-      render :content_type => Mime::RSS

     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],
     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],


@@ -108,8 +120,6 @@ class DiaryEntryController < ApplicationController
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary"
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary"

-
-      render :content_type => Mime::RSS

     end
   end
 
     end
   end
 


@@ -121,6 +131,7 @@ class DiaryEntryController < ApplicationController
       if @entry
         @title = t 'diary_entry.view.title', :user => params[:display_name]
       else
       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
         render :action => 'no_such_entry', :status => :not_found
       end
     else