libs/web: restore protected call to Template(), was accidentally removed in r4889

[oweals/luci.git] / libs / web / luasrc / i18n.lua

diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua
index 082a6007835646614302edef5be5b8a3bb0219f3..9a11a9dc8ff6744bdf89a63cfe81bee026025c77 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")
+require("lmo")
 
 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
-               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
-                       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
@@ -99,5 +109,26 @@ end
 -- @param ...          Format parameters
 -- @return                     Translated and formatted string
 function translatef(key, default, ...)
-       return translate(key, default):format(...)
+       return tostring(translate(key, default)):format(...)
+end
+
+--- Return the translated value for a specific translation key
+-- and ensure that the returned value is a Lua string value.
+-- This is the same as calling <code>tostring(translate(...))</code>
+-- @param key          Translation key
+-- @param default      Default translation
+-- @return                     Translated string
+function string(key, default)
+       return tostring(translate(key, default))
+end
+
+--- Return the translated value for a specific translation key and use it as sprintf pattern.
+-- Ensure that the returned value is a Lua string value.
+-- This is the same as calling <code>tostring(translatef(...))</code>
+-- @param key          Translation key
+-- @param default      Default translation
+-- @param ...          Format parameters
+-- @return                     Translated and formatted string
+function stringf(key, default, ...)
+       return tostring(translate(key, default)):format(...)
 end