From c8675d0c5560fb47eace7db531c381edbef25db7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 1 Mar 2016 17:25:55 +0100 Subject: [PATCH] modules/base: dispatcher: use default language if automatic choice fails Fall back to default language if "auto" is configured, but none provided by the browser matches. Signed-off-by: Matthias Schiffer --- modules/luci-base/luasrc/dispatcher.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua index c7903e638..0876ce658 100644 --- a/modules/luci-base/luasrc/dispatcher.lua +++ b/modules/luci-base/luasrc/dispatcher.lua @@ -197,6 +197,7 @@ function dispatch(request) assert(conf.main, "/etc/config/luci seems to be corrupt, unable to find section 'main'") + local i18n = require "luci.i18n" local lang = conf.main.lang or "auto" if lang == "auto" then local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or "" @@ -208,7 +209,10 @@ function dispatch(request) end end end - require "luci.i18n".setlanguage(lang) + if lang == "auto" then + lang = i18n.default + end + i18n.setlanguage(lang) local c = ctx.tree local stat -- 2.11.0