X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/37749e07e16363491de48cb4f26aff05c3624b80..0e96027a209d59ff5e7f5c2b1405febc59664a16:/app/controllers/application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 3d16ffa69..c5624db14 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -102,6 +102,15 @@ class ApplicationController < ActionController::Base
   end
   
   def set_locale
+    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