From c8c810a0a4511be30b33ae3d3096211817db11a3 Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Fri, 7 Jun 2013 19:05:28 +0200
Subject: [PATCH] added user setting to set_locale

---
 lib/foodsoft/controller_extensions.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/foodsoft/controller_extensions.rb b/lib/foodsoft/controller_extensions.rb
index 476906cc..a5f3fe6f 100644
--- a/lib/foodsoft/controller_extensions.rb
+++ b/lib/foodsoft/controller_extensions.rb
@@ -12,6 +12,10 @@ module Foodsoft
         params[:locale]
       end
 
+      def user_settings_language
+        current_user.settings.profile['language'] if current_user
+      end
+      
       def session_language
         session[:locale]
       end
@@ -27,7 +31,7 @@ module Foodsoft
       protected
 
       def select_language_according_to_priority
-        language = explicitly_requested_language || session_language || browser_language
+        language = explicitly_requested_language || session_language || user_settings_language || browser_language
         language.to_sym unless language.blank?
       end