Fix language selection broken after po file merges

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

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 3fdccbf..e3d7d41 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
@@ -12,33 +12,43 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 require("luci.config")
-m = Map("luci", translate("webui"), translate("a_i_luci1", 
- "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst werden."))
+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>."))
 
-c = m:section(NamedSection, "main", "core", translate("general"))
+local fs = require "nixio.fs"
 
-l = c:option(ListValue, "lang", translate("language"))
+-- force reload of global luci config namespace to reflect the changes
+function m.commit_handler(self)
+       package.loaded["luci.config"] = nil
+       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
+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)
        end
 end
 
-u = m:section(NamedSection, "uci_oncommit", "event", translate("a_i_ucicommit"),
- translate("a_i_ucicommit1"))
+u = m:section(NamedSection, "uci_oncommit", "event", translate("Post-commit actions"),
+ translate("These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."))
 u.dynamic = true
 
-f = m:section(NamedSection, "flash_keep", "extern", translate("a_i_keepflash"),
- translate("a_i_keepflash1"))
+f = m:section(NamedSection, "flash_keep", "extern", translate("Files to be kept when flashing a new firmware"),
+ translate("When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."))
 f.dynamic = true
 
-return m
\ No newline at end of file
+return m