Rename views to rails 2 style names.

[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..165f4130621162208996584dc6aca905616439e3 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -32,8 +32,6 @@ class DiaryEntryController < ApplicationController
     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
@@ -65,6 +63,7 @@ class DiaryEntryController < ApplicationController
                                           :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
@@ -79,6 +78,8 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
+    request.format = :rss
+
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
@@ -87,8 +88,6 @@ 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"
-
-        render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end
@@ -99,8 +98,6 @@ class DiaryEntryController < ApplicationController
       @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],
@@ -108,8 +105,6 @@ class DiaryEntryController < ApplicationController
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary"
-
-      render :content_type => Mime::RSS
     end
   end