Added multi-phone numbers in mobile setting page and fixed language setting

This commit is contained in:
Manson Wang committed 2013-12-12 16:07:27 +08:00
1 parent 4c85d62866
commit afb5afeceb
7 files changed
+69 -23

No files matched your search

@@ -163,6 +163,7 @@ class ApplicationController < ActionController::Base
browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
if browser_locale.eql?("zh")
condition = @site.in_use_locales.include?("zh_tw")
browser_locale = "zh_tw"
else
condition = @site.in_use_locales.include?(browser_locale)
end