modules/admin-mini: fix the same issue in admin-mini

[project/luci.git] / modules / admin-mini / luasrc / model / cbi / mini / luci.lua

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
index 8d4e705..d358c8a 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -12,23 +12,31 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.config")
+
+require "luci.config"
+local fs = require "nixio.fs"
+
 m = Map("luci", translate("webui"), translate("a_i_luci1"))
 
 -- force reload of global luci config namespace to reflect the changes
 function m.commit_handler(self)
        package.loaded["luci.config"] = nil
-       require("luci.config")
+       require "luci.config"
 end
 
 
 c = m:section(NamedSection, "main", "core", translate("general"))
 
 l = c:option(ListValue, "lang", translate("language"))
+l:value("auto")
 
 local i18ndir = luci.i18n.i18ndir .. "default."
-for k, v in pairs(luci.config.languages) do
-       if k:sub(1, 1) ~= "." and luci.fs.isfile(i18ndir .. k .. ".lua") then
+for k, v in luci.util.kspairs(luci.config.languages) do
+       local file = i18ndir .. k:gsub("_", "-")
+       if k:sub(1, 1) ~= "." and (
+               fs.access(file .. ".lua") or
+               fs.access(file .. ".lua.gz")
+       ) then
                l:value(k, v)
        end
 end