diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-05 17:58:26 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-05 17:58:26 +0000 |
| commit | 1208a34bb4be0de0b4e09fad188b9fc319008b45 (patch) | |
| tree | 26076f70c416fc3c98261d57be27d0aa73acbcb7 /applications | |
| parent | 99bf12fb631b5633e8654123aa9e3a40a168a605 (diff) | |
applications/luci-statistics: repair rrdtool i18n handling
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-statistics/luasrc/statistics/i18n.lua | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/applications/luci-statistics/luasrc/statistics/i18n.lua b/applications/luci-statistics/luasrc/statistics/i18n.lua index 213131bd3..b7c6bcb99 100644 --- a/applications/luci-statistics/luasrc/statistics/i18n.lua +++ b/applications/luci-statistics/luasrc/statistics/i18n.lua @@ -41,15 +41,24 @@ function Instance._subst( self, str, val ) return str 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 ) - local title = self.i18n.string( + local title = self:_translate( 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 ), - self.i18n.string( + self:_translate( string.format( "stat_dg_title_%s__%s", plugin, dtype ), - self.i18n.string( + self:_translate( string.format( "stat_dg_title_%s", plugin ), self.graph:_mkpath( plugin, pinst, dtype ) ) @@ -68,13 +77,13 @@ end 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 ), - self.i18n.string( + self:_translate( string.format( "stat_dg_label_%s_%s", plugin, pinst ), - self.i18n.string( + self:_translate( string.format( "stat_dg_label_%s__%s", plugin, dtype ), - self.i18n.string( + self:_translate( string.format( "stat_dg_label_%s", plugin ), self.graph:_mkpath( plugin, pinst, dtype ) ) @@ -93,13 +102,13 @@ end 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 ), - self.i18n.string( + self:_translate( 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 ), - self.i18n.string( + self:_translate( string.format( "stat_ds_%s", source.type ), source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds ) |