libs/core: remove various uses of global vars in luci.ip

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

diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua
index 9a11a9dc8ff6744bdf89a63cfe81bee026025c77..816d90310af692298b830b6cbbd8be47ebc1eaae 100644 (file)
--- a/libs/web/luasrc/i18n.lua
+++ b/libs/web/luasrc/i18n.lua
@@ -93,42 +93,38 @@ function setlanguage(lang)
 end
 
 --- Return the translated value for a specific translation key.
--- @param key  Translation key
--- @param def  Default translation
+-- @param key  Default translation text
 -- @return             Translated string
-function translate(key, def)
+function translate(key)
        return (table[context.lang] and table[context.lang][key])
                or (table[context.parent] and table[context.parent][key])
                or (table[default] and table[default][key])
-               or def
+               or key
 end
 
 --- Return the translated value for a specific translation key and use it as sprintf pattern.
--- @param key          Translation key
--- @param default      Default translation
+-- @param key          Default translation text
 -- @param ...          Format parameters
 -- @return                     Translated and formatted string
-function translatef(key, default, ...)
-       return tostring(translate(key, default)):format(...)
+function translatef(key, ...)
+       return tostring(translate(key)):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
+-- @param key          Default translation text
 -- @return                     Translated string
-function string(key, default)
-       return tostring(translate(key, default))
+function string(key)
+       return tostring(translate(key))
 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 key          Default translation text
 -- @param ...          Format parameters
 -- @return                     Translated and formatted string
-function stringf(key, default, ...)
-       return tostring(translate(key, default)):format(...)
+function stringf(key, ...)
+       return tostring(translate(key)):format(...)
 end