luci-0.9: merge r6081

This commit is contained in:
Jo-Philipp Wich 2010-04-16 19:05:48 +00:00
parent 9391668d82
commit 57dc871f5a

View file

@ -146,7 +146,7 @@ function dispatch(request)
assert(conf.main,
"/etc/config/luci seems to be corrupt, unable to find section 'main'")
local lang = conf.main.lang
local lang = conf.main.lang or "auto"
if lang == "auto" then
local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
for lpat in aclang:gmatch("[%w-]+") do
@ -156,7 +156,7 @@ function dispatch(request)
break
end
end
end
end
require "luci.i18n".setlanguage(lang)
local c = ctx.tree