|
@@ -0,0 +1,28 @@
|
|
|
+From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
+Date: Thu, 19 Mar 2015 18:44:52 +0100
|
|
|
+Subject: modules/base: dispatcher: set default language if none provided by the browser matches
|
|
|
+
|
|
|
+diff --git a/modules/base/luasrc/dispatcher.lua b/modules/base/luasrc/dispatcher.lua
|
|
|
+index f7e16e7..479ac54 100644
|
|
|
+--- a/modules/base/luasrc/dispatcher.lua
|
|
|
++++ b/modules/base/luasrc/dispatcher.lua
|
|
|
+@@ -211,6 +211,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 ""
|
|
|
+@@ -222,7 +223,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
|