developers/orbit-4-1
Archived
2
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rescue nil in Albums

Browse Source
This commit is contained in:
saurabhbhatia committed 2013-11-28 16:22:03 +08:00
1 parent 1a4c689ee6
commit f509e74938
3 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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