Merge branch 'master' of https://github.com/bikebike/BikeBike
This commit is contained in:
commit
839aa7bbb7
@ -139,7 +139,7 @@ module I18n
|
|||||||
if lang === false
|
if lang === false
|
||||||
lang = nil
|
lang = nil
|
||||||
elsif lang.nil?
|
elsif lang.nil?
|
||||||
if (lang = host.gsub(/^(dev|test|www)[\-\.](.*)$/, '\2').gsub(/^(([^\.]+)\.)?[^\.]+\.[^\.]+$/, '\2')).blank?
|
if (lang = host.gsub(/^(dev|test|www)[\-\.](.*)$/, '\2').gsub(/^(([^\.]+)\.)?[^\.]+\.[^\.]+$/, '\2')).blank? || (host == "localhost")
|
||||||
lang = default
|
lang = default
|
||||||
end
|
end
|
||||||
if get_language_codes().include? lang
|
if get_language_codes().include? lang
|
||||||
|
Loading…
x
Reference in New Issue
Block a user