started Russian translation

[rails.git] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index d902eac75528cff48a6edf870e45d6ac3bffb7a2..6ead2d6685f260f32665bd321958ad5b81dfd66d 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -102,7 +102,18 @@ class ApplicationController < ActionController::Base
   end
   
   def set_locale
-    request.compatible_language_from(I18n.backend.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)
+
+    response.headers['Content-Language'] = I18n.locale
   end
 
   def api_call_handle_error