Merge remote-tracking branch 'upstream/pull/1827'

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 908a3d013a5538c698735ce79d3676b185f1fcf4..da3964142fb60a3c65e4bca7704a0b72a9eca2c5 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -189,7 +189,7 @@ class User < ActiveRecord::Base
   end
 
   def preferred_languages
-    @locales ||= Locale.list(languages)
+    @preferred_languages ||= Locale.list(languages)
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)