X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5f4b7d3f916e132f860ab12c017aba638556abf8..4028f4cdb91f616bc774dc9b9fa8c7183eb1f6dd:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 0053333e2..eae917af8 100644 --- 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)