Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/web: Removed deprecated i18n-file naming convention

Browse source
This commit is contained in:
Steven Barth 2008-07-06 15:21:12 +00:00
parent 8f770fd17a
commit f12acd8a11
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/web/luasrc/i18n.lua
View file

@ -43,7 +43,6 @@ function load(file, lang, force)
lang = lang or "" lang = lang or ""
if force or not loaded[lang] or not loaded[lang][file] then if force or not loaded[lang] or not loaded[lang][file] then
local f = loadfile(i18ndir .. file .. "." .. lang .. ".lua") local f = loadfile(i18ndir .. file .. "." .. lang .. ".lua")
or loadfile(i18ndir .. file .. "." .. lang)
if f then if f then
table[lang] = table[lang] or {} table[lang] = table[lang] or {}
setfenv(f, table[lang]) setfenv(f, table[lang])

4
modules/admin-core/luasrc/model/cbi/admin_index/luci.lua
View file

@ -21,9 +21,7 @@ l = c:option(ListValue, "lang", translate("language"))
local i18ndir = luci.i18n.i18ndir .. "default." 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) ~= "." if k:sub(1, 1) ~= "." and luci.fs.isfile(i18ndir .. k .. ".lua") then
and (luci.fs.isfile(i18ndir .. k .. ".lua")
or luci.fs.isfile(i18ndir .. k)) then
l:value(k, v) l:value(k, v)
end end
end end