* libs/web: Fixed translation handling

diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci
index 31c7cb4..30acca4 100644 (file)
--- a/libs/web/root/etc/config/luci
+++ b/libs/web/root/etc/config/luci
@@ -34,7 +34,7 @@ config event uci_oncommit
 config internal languages
        option de "Deutsch"
        option en "English"
 config internal languages
        option de "Deutsch"
        option en "English"

-       option fr "French"
+       option fr "Français"

        
 config internal sauth
        option sessionpath "/tmp/.lucisessions"
        
 config internal sauth
        option sessionpath "/tmp/.lucisessions"

diff --git a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
index f761661..be4b08c 100644 (file)
--- a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
@@ -18,8 +18,12 @@ m = Map("luci", translate("webui"), translate("a_i_luci1",
 c = m:section(NamedSection, "main", "core", translate("general"))
 
 l = c:option(ListValue, "lang", translate("language"))
 c = m:section(NamedSection, "main", "core", translate("general"))
 
 l = c:option(ListValue, "lang", translate("language"))

+
+local i18ndir = luci.i18n.i18ndir .. "default."

 for k, v in pairs(luci.config.languages) do
 for k, v in pairs(luci.config.languages) do

-       if k:sub(1, 1) ~= "." then
+       if k:sub(1, 1) ~= "." 
+        and (luci.fs.isfile(i18ndir .. k .. ".lua") 
+         or luci.fs.isfile(i18ndir .. k)) then

                l:value(k, v)
        end
 end
                l:value(k, v)
        end
 end