Fix language selection broken after po file merges

[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..78255c1 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -12,28 +12,33 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.config")
-m = Map("luci", translate("webui"), translate("a_i_luci1"))
+
+require "luci.config"
+local fs = require "nixio.fs"
+
+m = Map("luci", translate("Web <abbr title=\"User Interface\">UI</abbr>"), translate("Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."))
 
 -- 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"))
+c = m:section(NamedSection, "main", "core", translate("General"))
 
-l = c:option(ListValue, "lang", translate("language"))
+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
+local i18ndir = luci.i18n.i18ndir .. "base."
+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 .. ".lmo") then
                l:value(k, v)
        end
 end
 
-t = c:option(ListValue, "mediaurlbase", translate("design"))
+t = c:option(ListValue, "mediaurlbase", translate("Design"))
 for k, v in pairs(luci.config.themes) do
        if k:sub(1, 1) ~= "." then
                t:value(v, k)