Added tranlations to trace/_trace

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 5a277c9b45b3c500cb595d9530c00bea1549a191..f38994e534596a71a9abf34bf3599698aab68502 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,13 +42,7 @@ class User < ActiveRecord::Base
 
   def self.authenticate(options)
     if options[:username] and options[:password]
-      environment = Rails.configuration.environment
-      adapter = Rails.configuration.database_configuration[environment]["adapter"]
-      if adapter == "postgresql"
-        user = find(:first, :conditions => ["email ILIKE ? OR display_name ILIKE ?", options[:username], options[:username]])
-      else
-        user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
-      end
+      user = find(:first, :conditions => ["email = ? OR display_name = ?", options[:username], options[:username]])
       user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt)
     elsif options[:token]
       token = UserToken.find(:first, :include => :user, :conditions => ["user_tokens.token = ?", options[:token]])
@@ -84,6 +78,18 @@ class User < ActiveRecord::Base
     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)
@@ -119,7 +125,7 @@ class User < ActiveRecord::Base
   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