Updated Site Preferences with language fix

This commit is contained in:
saurabhbhatia committed 2013-10-21 16:53:11 +08:00
1 parent ace582be0c
commit e42cf8720e
3 files changed
+21 -6

No files matched your search

+2 -1
View File
@@ -158,7 +158,7 @@ class ApplicationController < ActionController::Base
end
session[:locale] = condition ? (default_locale || browser_locale || session[:locale]) : I18n.default_locale.to_s
I18n.locale = session[:locale].to_sym
@site_in_use_locales = site_locales_default_head(@site.in_use_locales)
@site_in_use_locales = @site.in_use_locales
@site_valid_locales = site_locales_default_head(@site.valid_locales)
end
@@ -203,6 +203,7 @@ class ApplicationController < ActionController::Base
def site_locales_default_head(locales)
if locales[0].eql? I18n.locale.to_s
Rails.logger.info
locales
else
a = Array.new(locales)