synced with en.yml [16143]

[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 2599bd479dd24ec15e901d042913da3297996ac4..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


@@ -102,7 +111,7 @@ class DiaryEntryController < ApplicationController
         :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}"
         :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} language"
+      @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,
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
       @entries = DiaryEntry.find(:all, :include => :user,


@@ -122,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