libs/web: Removed deprecated i18n-file naming convention

diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua
index 2c2bb2e1a20df45d6320c5650d22f01e069bd467..e3011620210010084c6ef2b29f6fd4a80dc85428 100644 (file)
--- a/libs/web/luasrc/i18n.lua
+++ b/libs/web/luasrc/i18n.lua
@@ -43,7 +43,6 @@ function load(file, lang, force)
        lang = lang or ""
        if force or not loaded[lang] or not loaded[lang][file] then
                local f = loadfile(i18ndir .. file .. "." .. lang .. ".lua")
-                or loadfile(i18ndir .. file .. "." .. lang)
                if f then
                        table[lang] = table[lang] or {}
                        setfenv(f, table[lang])

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 be4b08cf53e8a5011ff43b1b7ec0474dc6e40a27..3fdccbf802232eee5dadee354d0b31760c17e193 100644 (file)
--- a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
@@ -21,9 +21,7 @@ l = c:option(ListValue, "lang", translate("language"))
 
 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") 
-         or luci.fs.isfile(i18ndir .. k)) then
+       if k:sub(1, 1) ~= "." and luci.fs.isfile(i18ndir .. k .. ".lua") then
                l:value(k, v)
        end
 end