Added tranlations to trace/_trace

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 4113662aa411e3e5c3c60b1f809f2a0d2dc3a93d..f38994e534596a71a9abf34bf3599698aab68502 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -78,6 +78,18 @@ class User < ActiveRecord::Base
     return el1
   end
 
     return el1
   end
 

+  def languages
+    attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+  end
+
+  def languages=(languages)
+    write_attribute(:languages, languages.join(","))
+  end
+
+  def preferred_language
+    languages.find { |l| Language.find(:first, :conditions => { :code => l }) }
+  end
+

   def nearby(radius = 50, num = 10)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
   def nearby(radius = 50, num = 10)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)


@@ -113,7 +125,7 @@ class User < ActiveRecord::Base
   def delete
     self.active = false
     self.display_name = "user_#{self.id}"
   def delete
     self.active = false
     self.display_name = "user_#{self.id}"

-    self.description = nil
+    self.description = ""

     self.home_lat = nil
     self.home_lon = nil
     self.image = nil
     self.home_lat = nil
     self.home_lon = nil
     self.image = nil