diff options
author | Jo-Philipp Wich <jo@mein.io> | 2018-10-18 13:32:52 +0200 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2018-11-05 11:01:45 +0100 |
commit | 8ff68c772b76855954cc7a2c163df4056fa19c56 (patch) | |
tree | 8c7891ded582388908f2d558d17b00cfbeb7a294 /modules/luci-base | |
parent | 7a98222106e604ce9d3c1eb7617ecc82109f6961 (diff) |
luci-base: remove unused i18n functions
Drop load(), loadc(), string() and stringf() from the luci.i18n class since
these functions are either no longer unused or were never used to begin with.
Also slightly rework the module to only use local symbols and unify the
module require style.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base')
-rw-r--r-- | modules/luci-base/luasrc/i18n.lua | 34 | ||||
-rw-r--r-- | modules/luci-base/luasrc/i18n.luadoc | 55 |
2 files changed, 6 insertions, 83 deletions
diff --git a/modules/luci-base/luasrc/i18n.lua b/modules/luci-base/luasrc/i18n.lua index 42de832f7b..323912b650 100644 --- a/modules/luci-base/luasrc/i18n.lua +++ b/modules/luci-base/luasrc/i18n.lua @@ -1,26 +1,16 @@ -- Copyright 2008 Steven Barth <steven@midlink.org> -- Licensed to the public under the Apache License 2.0. -module("luci.i18n", package.seeall) -require("luci.util") +local tparser = require "luci.template.parser" +local util = require "luci.util" +local tostring = tostring -local tparser = require "luci.template.parser" +module "luci.i18n" -table = {} -i18ndir = luci.util.libpath() .. "/i18n/" -loaded = {} -context = luci.util.threadlocal() +i18ndir = util.libpath() .. "/i18n/" +context = util.threadlocal() default = "en" -function clear() -end - -function load(file, lang, force) -end - --- Alternatively load the translation of the fallback language. -function loadc(file, force) -end function setlanguage(lang) local code, subcode = lang:match("^([A-Za-z][A-Za-z])[%-_]([A-Za-z][A-Za-z])$") @@ -58,18 +48,6 @@ function translatef(key, ...) return tostring(translate(key)):format(...) end --- and ensure that the returned value is a Lua string value. --- This is the same as calling <code>tostring(translate(...))</code> -function string(key) - return tostring(translate(key)) -end - --- Ensure that the returned value is a Lua string value. --- This is the same as calling <code>tostring(translatef(...))</code> -function stringf(key, ...) - return tostring(translate(key)):format(...) -end - function dump() local rv = {} tparser.get_translations(function(k, v) rv[k] = v end) diff --git a/modules/luci-base/luasrc/i18n.luadoc b/modules/luci-base/luasrc/i18n.luadoc index df6e38e5de..b76c298565 100644 --- a/modules/luci-base/luasrc/i18n.luadoc +++ b/modules/luci-base/luasrc/i18n.luadoc @@ -4,35 +4,6 @@ LuCI translation library. module "luci.i18n" ---[[ -Clear the translation table. - -@class function -@name clear -]] - ----[[ -Load a translation and copy its data into the translation table. - -@class function -@name load -@param file Language file -@param lang Two-letter language code -@param force Force reload even if already loaded (optional) -@return Success status -]] - ----[[ -Load a translation file using the default translation language. - -Alternatively load the translation of the fallback language. - -@class function -@name loadc -@param file Language file -@param force Force reload even if already loaded (optional) -]] - ----[[ Set the context default translation language. @class function @@ -61,32 +32,6 @@ Return the translated value for a specific translation key and use it as sprintf ]] ---[[ -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> - -@class function -@name string -@param key Default translation text -@return Translated string -]] - ----[[ -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> - -@class function -@name stringf -@param key Default translation text -@param ... Format parameters -@return Translated and formatted string -]] - ----[[ Return all currently loaded translation strings as a key-value table. The key is the hexadecimal representation of the translation key while the value is the translated text content. |