From d82340ada43ccbc098e6f40dfee8603ec1231385 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 31 Aug 2008 14:38:28 +0000 Subject: [PATCH] * luci/applications: statistics: pick up new rrdtool translations in controller and rrdtool-i18n binding --- .../luasrc/controller/luci_statistics/luci_statistics.lua | 3 ++- applications/luci-statistics/luasrc/statistics/i18n.lua | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua index 5167fe0a9..53ce34ec3 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -22,7 +22,8 @@ function index() require("luci.i18n") require("luci.statistics.datatree") - -- load language file + -- load language files + luci.i18n.loadc("rrdtool") luci.i18n.loadc("statistics") -- get rrd data tree diff --git a/applications/luci-statistics/luasrc/statistics/i18n.lua b/applications/luci-statistics/luasrc/statistics/i18n.lua index 9aa642c34..4cbcdd4cf 100644 --- a/applications/luci-statistics/luasrc/statistics/i18n.lua +++ b/applications/luci-statistics/luasrc/statistics/i18n.lua @@ -26,6 +26,7 @@ function Instance.__init__( self, graph ) self.i18n = luci.i18n self.graph = graph + self.i18n.loadc("rrdtool") self.i18n.loadc("statistics") end @@ -56,7 +57,7 @@ function Instance.title( self, plugin, pinst, dtype, dinst ) ) ) - return self:_subst( title, { + return self:_subst( title, { plugin = plugin, pinst = pinst, dtype = dtype, @@ -81,7 +82,7 @@ function Instance.label( self, plugin, pinst, dtype, dinst ) ) ) - return self:_subst( label, { + return self:_subst( label, { plugin = plugin, pinst = pinst, dtype = dtype, @@ -106,7 +107,7 @@ function Instance.ds( self, source ) ) ) - return self:_subst( label, { + return self:_subst( label, { dtype = source.type, dinst = source.instance, dsrc = source.ds -- 2.25.1