X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fd6f00b069af5a7b87227ea4c3401dc461d7311a..be57524849c240856ceeffa9ea02340ba6057710:/app/controllers/diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 3ee36af21..7a442ac58 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -2,40 +2,46 @@ class DiaryEntryController < ApplicationController
   layout 'site', :except => :rss
 
   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
-    @title = 'New diary entry'
+    @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
+      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
 
   def edit
-    @title= 'Edit diary entry'
+    @title= 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.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
@@ -60,18 +66,25 @@ class DiaryEntryController < ApplicationController
       @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
       if @this_user
-        @title = @this_user.display_name + "'s diary"
+        @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
         @entry_pages, @entries = paginate(:diary_entries,
                                           :conditions => ['user_id = ?', @this_user.id],
                                           :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
+    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 = "Users' diaries"
+      @title = t 'diary_entry.list.title'
       @entry_pages, @entries = paginate(:diary_entries, :include => :user,
                                         :conditions => ["users.visible = ?", true],
                                         :order => 'created_at DESC',
@@ -80,6 +93,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})
 
@@ -88,11 +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"
-
-        render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end
+    elsif params[:language]
+      @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}"
+      @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],
@@ -100,8 +120,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
 
@@ -110,7 +128,12 @@ class DiaryEntryController < ApplicationController
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])
-      @title = "Users' diaries | #{params[:display_name]}"
+      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
       @not_found_user = params[:display_name]