First stage of i18n. Some migrations and extra plugins.

[rails.git] / app / models / diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8063372da9065c67c18c15a4f0dce2847cc39485..33e95d17508057e3a9447a238a4e3faaeed7e296 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,12 +1,14 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
+  belongs_to :language, :foreign_key => 'language'
+  
   has_many :diary_comments, :include => :user,
-                            :conditions => "users.visible = 1",
+                            :conditions => ["users.visible = ?", true],
                             :order => "diary_comments.id"
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
-  validates_length_of :language, :within => 2..3, :allow_nil => true
+  #validates_length_of :language, :within => 2..5, :allow_nil => false
   validates_numericality_of :latitude, :allow_nil => true,
                             :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
   validates_numericality_of :longitude, :allow_nil => true,