Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

fixes locales issue

Browse source
This commit is contained in:
Manuel Wiedenmann 2013-06-06 03:18:02 +02:00
parent c2c1961bd0
commit 47405b5b19
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/foodsoft/controller_extensions.rb
View file

@ -8,7 +8,6 @@ module Foodsoft
before_filter :set_locale before_filter :set_locale
end end
module InstanceMethods
def explicitly_requested_language def explicitly_requested_language
params[:locale] params[:locale]
end end
@ -28,7 +27,8 @@ module Foodsoft
protected protected
def select_language_according_to_priority def select_language_according_to_priority
explicitly_requested_language || session_language || browser_language language = explicitly_requested_language || session_language || browser_language
language.to_sym unless language.blank?
end end
def available_locales def available_locales
@ -45,7 +45,6 @@ module Foodsoft
locale = session[:locale] = ::I18n.locale locale = session[:locale] = ::I18n.locale
logger.info("Set locale to #{locale}") logger.info("Set locale to #{locale}")
end end
end
end end
end end