Rework locale selection

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 0053333e2c3ed5e8ede766dba02d284cb11372a4..eae917af8dc26884a1d5e4a998827ea2b9c2ed7b 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -131,8 +131,8 @@ class User < ActiveRecord::Base
     languages.find { |l| Language.exists?(:code => l) }
   end
 
-  def preferred_language_from(array)
-    (languages & array.collect(&:to_s)).first
+  def preferred_languages
+    @locales ||= Locale.list(languages)
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)