X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2bf56c7be32bd05d97aa08298c649478cf82d4af..6254853c5c6a76417aed186798a0292c07d30ff4:/app/controllers/application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 97332ba01..c5624db14 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -102,7 +102,16 @@ class ApplicationController < ActionController::Base
   end
   
   def set_locale
-    request.compatible_language_from(I18n.available_locales)
+    if @user
+      if !@user.languages.empty?
+        request.user_preferred_languages = @user.languages
+      elsif !request.user_preferred_languages.empty?
+        @user.languages = request.user_preferred_languages
+        @user.save
+      end
+    end
+
+    I18n.locale = request.compatible_language_from(I18n.available_locales)
   end
 
   def api_call_handle_error