modules/admin-{mini,full}: sort by keys in language selection

diff --git a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
index 6ec13b8..caf7c97 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
@@ -28,7 +28,7 @@ l = c:option(ListValue, "lang", translate("language"))
 l:value("auto")
 
 local i18ndir = luci.i18n.i18ndir .. "default."
 l:value("auto")
 
 local i18ndir = luci.i18n.i18ndir .. "default."

-for k, v in pairs(luci.config.languages) do
+for k, v in luci.util.kspairs(luci.config.languages) do

        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and (
                luci.fs.access(file .. ".lua") or
        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and (
                luci.fs.access(file .. ".lua") or

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
index d3afd55..0a57b30 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -28,7 +28,7 @@ l = c:option(ListValue, "lang", translate("language"))
 l:value("auto")
 
 local i18ndir = luci.i18n.i18ndir .. "default."
 l:value("auto")
 
 local i18ndir = luci.i18n.i18ndir .. "default."

-for k, v in pairs(luci.config.languages) do
+for k, v in luci.util.kspairs(luci.config.languages) do

        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and (
                luci.fs.access(file .. ".lua") or
        local file = i18ndir .. k:gsub("_", "-")
        if k:sub(1, 1) ~= "." and (
                luci.fs.access(file .. ".lua") or