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

applications/luci-statistics: repair rrdtool i18n handling

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-12-05 17:58:26 +00:00
parent 99bf12fb63
commit 1208a34bb4
1 changed files with 21 additions and 12 deletions

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

@ -41,15 +41,24 @@ function Instance._subst( self, str, val )
return str return str
end end
function Instance._translate( self, key, alt )
local val = self.i18n.string(key)
if val ~= key then
return val
else
return alt
end
end
function Instance.title( self, plugin, pinst, dtype, dinst ) function Instance.title( self, plugin, pinst, dtype, dinst )
local title = self.i18n.string( local title = self:_translate(
string.format( "stat_dg_title_%s_%s_%s", plugin, pinst, dtype ), string.format( "stat_dg_title_%s_%s_%s", plugin, pinst, dtype ),
self.i18n.string( self:_translate(
string.format( "stat_dg_title_%s_%s", plugin, pinst ), string.format( "stat_dg_title_%s_%s", plugin, pinst ),
self.i18n.string( self:_translate(
string.format( "stat_dg_title_%s__%s", plugin, dtype ), string.format( "stat_dg_title_%s__%s", plugin, dtype ),
self.i18n.string( self:_translate(
string.format( "stat_dg_title_%s", plugin ), string.format( "stat_dg_title_%s", plugin ),
self.graph:_mkpath( plugin, pinst, dtype ) self.graph:_mkpath( plugin, pinst, dtype )
) )
@ -68,13 +77,13 @@ end
function Instance.label( self, plugin, pinst, dtype, dinst ) function Instance.label( self, plugin, pinst, dtype, dinst )
local label = self.i18n.string( local label = self:_translate(
string.format( "stat_dg_label_%s_%s_%s", plugin, pinst, dtype ), string.format( "stat_dg_label_%s_%s_%s", plugin, pinst, dtype ),
self.i18n.string( self:_translate(
string.format( "stat_dg_label_%s_%s", plugin, pinst ), string.format( "stat_dg_label_%s_%s", plugin, pinst ),
self.i18n.string( self:_translate(
string.format( "stat_dg_label_%s__%s", plugin, dtype ), string.format( "stat_dg_label_%s__%s", plugin, dtype ),
self.i18n.string( self:_translate(
string.format( "stat_dg_label_%s", plugin ), string.format( "stat_dg_label_%s", plugin ),
self.graph:_mkpath( plugin, pinst, dtype ) self.graph:_mkpath( plugin, pinst, dtype )
) )
@ -93,13 +102,13 @@ end
function Instance.ds( self, source ) function Instance.ds( self, source )
local label = self.i18n.string( local label = self:_translate(
string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ), string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ),
self.i18n.string( self:_translate(
string.format( "stat_ds_%s_%s", source.type, source.instance ), string.format( "stat_ds_%s_%s", source.type, source.instance ),
self.i18n.string( self:_translate(
string.format( "stat_ds_label_%s__%s", source.type, source.ds ), string.format( "stat_ds_label_%s__%s", source.type, source.ds ),
self.i18n.string( self:_translate(
string.format( "stat_ds_%s", source.type ), string.format( "stat_ds_%s", source.type ),
source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds
) )