Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions script/locale-loader.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@ local function mergeKey(key, k)
if not key then
return k
end
if k:sub(1, 1):match '%w' then
return key .. '.' .. k
k = tostring(k)
if k:sub(1, 1):match("%w") then
return key .. "." .. k
else
return key .. k
end
end

local function proxy(results, key)
return setmetatable({}, {
__index = function (_, k)
__index = function(_, k)
return proxy(results, mergeKey(key, k))
end,
__newindex = function (_, k, v)
__newindex = function(_, k, v)
results[mergeKey(key, k)] = v
end
end,
})
end

return function (text, path, results)
return function(text, path, results)
results = results or {}
assert(load(text, '@' .. path, "t", proxy(results)))()
assert(load(text, "@" .. path, "t", proxy(results)))()
return results
end
Loading