translated some user e-mails

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 64eb2180f6d7f0807b1a4aef5987110185a98f0d..c5624db146b4cdbfb86d03f84308c2d6f721f96e 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -100,6 +100,19 @@ class ApplicationController < ActionController::Base
     response.headers['Error'] = message
     render :text => message, :status => status
   end
     response.headers['Error'] = message
     render :text => message, :status => status
   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

 
   def api_call_handle_error
     begin
 
   def api_call_handle_error
     begin


@@ -134,7 +147,6 @@ class ApplicationController < ActionController::Base
   end
 
 private 
   end
 
 private 

-

   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it 
   # extract authorisation credentials from headers, returns user = nil if none
   def get_auth_data 
     if request.env.has_key? 'X-HTTP_AUTHORIZATION'          # where mod_rewrite might have put it