First stage of i18n. Some migrations and extra plugins.

[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 3592ccb4fb683ce50558ca14dd76580ac9e98fde..9fad57c02522b44227ad4759c08e4418e2bbbfc3 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,9 +1,11 @@
 class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 
 class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 

+  before_filter :set_locale

   before_filter :authorize_web
   before_filter :require_user, :only => [:new, :edit]
   before_filter :authorize_web
   before_filter :require_user, :only => [:new, :edit]

-  before_filter :check_database_availability
+  before_filter :check_database_readable
+  before_filter :check_database_writable, :only => [:new, :edit]

 
   def new
     @title = 'New diary entry'
 
   def new
     @title = 'New diary entry'


@@ -29,12 +31,7 @@ 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]

-      @diary_entry.title = params[:diary_entry][:title]
-      @diary_entry.body = params[:diary_entry][:body]
-      @diary_entry.latitude = params[:diary_entry][:latitude]
-      @diary_entry.longitude = params[:diary_entry][:longitude]
-
-      if @diary_entry.save
+      if @diary_entry.update_attributes(params[:diary_entry])

         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
       end
     end
         redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
       end
     end


@@ -92,6 +89,15 @@ class DiaryEntryController < ApplicationController
       else
         render :nothing => true, :status => :not_found
       end
       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]],
+        :order => 'created_at DESC', :limit => 20)
+      @title = "OpenStreetMap diary entries in #{params[:language]}"
+      @description = "Recent diary entries from users of OpenStreetMap"
+      @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],