X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/53b4d645d80cbe4ac397cfc004e8985317aed6a8..010dc8719596add0fec05a7d43f677dffdf03beb:/app/models/user.rb?ds=sidebyside

diff --git a/app/models/user.rb b/app/models/user.rb
index 85d971316..683fcc96b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,8 +1,6 @@
 class User < ActiveRecord::Base
   require 'xml/libxml'
 
-  belongs_to :language, :foreign_key => 'locale'
-  
   has_many :traces
   has_many :diary_entries, :order => 'created_at DESC'
   has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC'
@@ -80,6 +78,22 @@ 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)