Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applications/luci-statistics: change i18n helper to accept model provided titles, remove magic translations

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-11-28 03:28:05 +00:00
parent 5d4191c848
commit 70a4a61664
1 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
applications/luci-statistics/luasrc/statistics/i18n.lua
View file

@ -50,21 +50,15 @@ function Instance._translate( self, key, alt )
end
end
function Instance.title( self, plugin, pinst, dtype, dinst )
function Instance.title( self, plugin, pinst, dtype, dinst, user_title )
local title = self:_translate(
string.format( "stat_dg_title_%s_%s_%s", plugin, pinst, dtype ),
self:_translate(
string.format( "stat_dg_title_%s_%s", plugin, pinst ),
self:_translate(
string.format( "stat_dg_title_%s__%s", plugin, dtype ),
self:_translate(
string.format( "stat_dg_title_%s", plugin ),
self.graph:_mkpath( plugin, pinst, dtype )
)
)
)
)
local title = user_title or
"p=%s/pi=%s/dt=%s/di=%s" % {
plugin,
(pinst and #pinst > 0) and pinst or "(nil)",
(dtype and #dtype > 0) and dtype or "(nil)",
(dinst and #dinst > 0) and dinst or "(nil)"
}
return self:_subst( title, {
plugin = plugin,
@ -75,21 +69,13 @@ function Instance.title( self, plugin, pinst, dtype, dinst )
end
function Instance.label( self, plugin, pinst, dtype, dinst )
function Instance.label( self, plugin, pinst, dtype, dinst, user_label )
local label = self:_translate(
string.format( "stat_dg_label_%s_%s_%s", plugin, pinst, dtype ),
self:_translate(
string.format( "stat_dg_label_%s_%s", plugin, pinst ),
self:_translate(
string.format( "stat_dg_label_%s__%s", plugin, dtype ),
self:_translate(
string.format( "stat_dg_label_%s", plugin ),
self.graph:_mkpath( plugin, pinst, dtype )
)
)
)
)
local label = user_label or
"dt=%s/di=%s" % {
(dtype and #dtype > 0) and dtype or "(nil)",
(dinst and #dinst > 0) and dinst or "(nil)"
}
return self:_subst( label, {
plugin = plugin,
@ -102,7 +88,7 @@ end
function Instance.ds( self, source )
local label = self:_translate(
local label = source.title or self:_translate(
string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ),
self:_translate(
string.format( "stat_ds_%s_%s", source.type, source.instance ),
@ -121,4 +107,5 @@ function Instance.ds( self, source )
dinst = source.instance,
dsrc = source.ds
} )
end