Merge branch 'master' into tests-rspec

Conflicts:
	Gemfile
	Gemfile.lock

lib/foodsoft/controller_extensions.rb

@@ -0,0 +1,55 @@
+# -*- encoding : utf-8 -*-
+module Foodsoft
+  module ControllerExtensions
+    module Locale
+      extend ActiveSupport::Concern
+
+      included do
+        before_filter :set_locale
+      end
+
+      def explicitly_requested_language
+        params[:locale]
+      end
+
+      def user_settings_language
+        current_user.locale if current_user
+      end
+      
+      def session_language
+        session[:locale]
+      end
+
+      def browser_language
+        request.env['HTTP_ACCEPT_LANGUAGE'] ? request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first : nil
+      end
+
+      def default_language
+        ::I18n.default_locale
+      end
+
+      protected
+
+      def select_language_according_to_priority
+        language = explicitly_requested_language || session_language || user_settings_language || browser_language
+        language.to_sym unless language.blank?
+      end
+
+      def available_locales
+        ::I18n.available_locales
+      end
+
+      def set_locale
+        if available_locales.include?(select_language_according_to_priority)
+          ::I18n.locale = select_language_according_to_priority
+        else
+          ::I18n.locale = default_language
+        end
+
+        locale = session[:locale] = ::I18n.locale
+        logger.info("Set locale to #{locale}")
+      end
+
+    end
+  end
+end

lib/tasks/foodsoft.rake

@@ -8,7 +8,7 @@ namespace :foodsoft do
       puts "Send notifications for #{task.name} to .."
       for user in task.users
         begin
-          Mailer.upcoming_tasks(user, task).deliver if user.settings['notify.upcoming_tasks'] == 1
+          Mailer.upcoming_tasks(user, task).deliver if user.settings.notify['upcoming_tasks'] == 1
         rescue
           puts "deliver aborted for #{user.email}.."
         end
@@ -23,7 +23,7 @@ namespace :foodsoft do
         unless task.enough_users_assigned?
           puts "Notify workgroup: #{workgroup.name} for task #{task.name}"
           for user in workgroup.users
-            if user.settings['messages.sendAsEmail'] == "1" && !user.email.blank?
+            if user.settings.messages['send_as_email'] == "1" && !user.email.blank?
               begin
                 Mailer.not_enough_users_assigned(task, user).deliver
               rescue