Go back to using to_sentence now that we are using rails 2.3 for the site.

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

diff --git a/app/models/user.rb b/app/models/user.rb
index f38994e534596a71a9abf34bf3599698aab68502..308e0a2ce58cbc3ab428cad708f9f6b4bedf6f28 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
   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
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :within => 8..255


@@ -90,6 +90,10 @@ class User < ActiveRecord::Base
     languages.find { |l| Language.find(:first, :conditions => { :code => l }) }
   end
 
     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)
   def nearby(radius = 50, num = 10)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)