saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for default locale

This commit is contained in:
saurabhbhatia 2013-12-09 11:10:55 +08:00
parent 87c3090784
commit 88260d59e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -162,9 +162,9 @@ class ApplicationController < ActionController::Base
#check enable langauge detection #check enable langauge detection
browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
condition = @site.in_use_locales.include?(browser_locale) condition = @site.in_use_locales.include?(browser_locale)
elsif (@site.default_locale.nil? && @site.enable_language_detection.eql?(false) && session[:locale].nil?) elsif (@site.default_locale.nil? && @site.enable_language_detection.eql?(false))
session[:locale] = @site.valid_locales.first backup_locale = @site.valid_locales.first
condition = @site.in_use_locales.include?(params[:locale]) condition = @site.in_use_locales.include?(backup_locale)
end end
session[:locale] = condition ? ( session[:locale] || default_locale || browser_locale || backup_locale) : I18n.default_locale.to_s session[:locale] = condition ? ( session[:locale] || default_locale || browser_locale || backup_locale) : I18n.default_locale.to_s