diff options
| author | Steven Barth <steven@midlink.org> | 2008-07-06 15:21:12 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-07-06 15:21:12 +0000 |
| commit | f12acd8a11a200d8f4c7c2bcccc38e44be56a983 (patch) | |
| tree | d80731dd6c2c59df3a2a69df8faa02aaf6eb9046 | |
| parent | 8f770fd17a561f9e7eecf0b415abb9bb5101cb94 (diff) | |
libs/web: Removed deprecated i18n-file naming convention
| -rw-r--r-- | libs/web/luasrc/i18n.lua | 1 | ||||
| -rw-r--r-- | modules/admin-core/luasrc/model/cbi/admin_index/luci.lua | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua index 2c2bb2e1a..e30116202 100644 --- 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 be4b08cf5..3fdccbf80 100644 --- 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 |