From 8ff68c772b76855954cc7a2c163df4056fa19c56 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 18 Oct 2018 13:32:52 +0200 Subject: 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 --- modules/luci-base/luasrc/i18n.lua | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) (limited to 'modules/luci-base/luasrc/i18n.lua') 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 -- 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 tostring(translate(...)) -function string(key) - return tostring(translate(key)) -end - --- Ensure that the returned value is a Lua string value. --- This is the same as calling tostring(translatef(...)) -function stringf(key, ...) - return tostring(translate(key)):format(...) -end - function dump() local rv = {} tparser.get_translations(function(k, v) rv[k] = v end) -- cgit v1.2.3