translated remaining missing phrases

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 5a277c9b45b3c500cb595d9530c00bea1549a191..241c1396ffeca73a51e25a40a72a779ee41a67f7 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,8 +12,8 @@ class User < ActiveRecord::Base
   has_many :changesets
 
   validates_presence_of :email, :display_name
-  validates_confirmation_of :email, :message => 'Email addresses must match'
-  validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
+  validates_confirmation_of :email#, :message => ' addresses must match'
+  validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :within => 8..255
@@ -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,17 +78,33 @@ 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 preferred_language_from(array)
+    (languages & array.collect { |i| i.to_s }).first
+  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)
       bounds = gc.bounds(radius)
-      nearby = User.find(:all, :conditions => ["visible = ? and home_lat between #{bounds[:minlat]} and #{bounds[:maxlat]} and home_lon between #{bounds[:minlon]} and #{bounds[:maxlon]} and data_public = ? and id != #{self.id}", true, true])
-      nearby.delete_if { |u| gc.distance(u.home_lat, u.home_lon) > radius }
-      nearby.sort! { |u1,u2| gc.distance(u1.home_lat, u1.home_lon) <=> gc.distance(u2.home_lat, u2.home_lon) }
+      sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
+      nearby = User.find(:all, 
+                         :conditions => ["id != ? AND visible = ? AND data_public = ? AND #{sql_for_distance} <= ?", id, true, true, radius], :order => sql_for_distance, :limit => num)
     else
       nearby = []
     end
-    return nearby.first(num)
+    return nearby
   end
 
   def distance(nearby_user)
@@ -119,7 +129,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