projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f2b1b11
)
libs/web: use lmo in luci.i18n
author
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 9 Jul 2009 15:05:29 +0000
(15:05 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 9 Jul 2009 15:05:29 +0000
(15:05 +0000)
libs/web/luasrc/i18n.lua
patch
|
blob
|
history
diff --git
a/libs/web/luasrc/i18n.lua
b/libs/web/luasrc/i18n.lua
index
082a600
..
dcca13e
100644
(file)
--- a/
libs/web/luasrc/i18n.lua
+++ b/
libs/web/luasrc/i18n.lua
@@
-27,6
+27,7
@@
limitations under the License.
--- LuCI translation library.
module("luci.i18n", package.seeall)
require("luci.util")
--- LuCI translation library.
module("luci.i18n", package.seeall)
require("luci.util")
+require("lmo")
table = {}
i18ndir = luci.util.libpath() .. "/i18n/"
table = {}
i18ndir = luci.util.libpath() .. "/i18n/"
@@
-47,13
+48,22
@@
end
function load(file, lang, force)
lang = lang and lang:gsub("_", "-") or ""
if force or not loaded[lang] or not loaded[lang][file] then
function load(file, lang, force)
lang = lang and lang:gsub("_", "-") 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 .. ".lua.gz")
-
+ local f = lmo.open(i18ndir .. file .. "." .. lang .. ".lmo")
if f then
if f then
- table[lang] = table[lang] or {}
- setfenv(f, table[lang])
- f()
+ if not table[lang] then
+ table[lang] = { f }
+ setmetatable(table[lang], {
+ __index = function(tbl, key)
+ for i = 1, #tbl do
+ local s = rawget(tbl, i):lookup(key)
+ if s then return s end
+ end
+ end
+ })
+ else
+ table[lang][#table[lang]+1] = f
+ end
+
loaded[lang] = loaded[lang] or {}
loaded[lang][file] = true
return true
loaded[lang] = loaded[lang] or {}
loaded[lang][file] = true
return true