X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/797cbaab1ef4b842f3b57bb46c29dea61b4c7e3a..f5e14bcc48725c13c36102f365812052d0a413cf:/app/controllers/diary_entry_controller.rb?ds=sidebyside diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index bd08bcd97..48cdda8a0 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -2,39 +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_availability + 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 @@ -47,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' @@ -59,18 +69,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', @@ -79,6 +96,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}) @@ -86,21 +105,24 @@ class DiaryEntryController < ApplicationController @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}" - @link = "http://www.openstreetmap.org/user/#{user.display_name}/diary" - - render :content_type => Mime::RSS + @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" 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], :order => 'created_at DESC', :limit => 20) @title = "OpenStreetMap diary entries" @description = "Recent diary entries from users of OpenStreetMap" - @link = "http://www.openstreetmap.org/diary" - - render :content_type => Mime::RSS + @link = "http://#{SERVER_URL}/diary" end end @@ -109,6 +131,12 @@ class DiaryEntryController < ApplicationController if user @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]]) + 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]