luci-0.11: merge outstanding trunk changes

[project/luci.git] / applications / luci-statistics / luasrc / statistics / i18n.lua

diff --git a/applications/luci-statistics/luasrc/statistics/i18n.lua b/applications/luci-statistics/luasrc/statistics/i18n.lua
index 4cbcdd4cf3a1a5d83a640a24a01af749729e3c3b..a1a2fa9de3a4ffc7c270b7054b04ed303aae44bd 100644 (file)
--- a/applications/luci-statistics/luasrc/statistics/i18n.lua
+++ b/applications/luci-statistics/luasrc/statistics/i18n.lua
@@ -25,9 +25,6 @@ Instance = luci.util.class()
 function Instance.__init__( self, graph )
        self.i18n  = luci.i18n
        self.graph = graph
-
-       self.i18n.loadc("rrdtool")
-       self.i18n.loadc("statistics")
 end
 
 function Instance._subst( self, str, val )
@@ -41,21 +38,24 @@ function Instance._subst( self, str, val )
        return str
 end
 
-function Instance.title( self, plugin, pinst, dtype, dinst )
-
-       local title = self.i18n.translate(
-               string.format( "stat_dg_title_%s_%s_%s", plugin, pinst, dtype ),
-               self.i18n.translate(
-                       string.format( "stat_dg_title_%s_%s", plugin, pinst ),
-                       self.i18n.translate(
-                               string.format( "stat_dg_title_%s__%s", plugin, dtype ),
-                               self.i18n.translate(
-                                       string.format( "stat_dg_title_%s", plugin ),
-                                       self.graph:_mkpath( plugin, pinst, dtype )
-                               )
-                       )
-               )
-       )
+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, user_title )
+
+       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,
@@ -66,21 +66,13 @@ function Instance.title( self, plugin, pinst, dtype, dinst )
 
 end
 
-function Instance.label( self, plugin, pinst, dtype, dinst )
-
-       local label = self.i18n.translate(
-               string.format( "stat_dg_label_%s_%s_%s", plugin, pinst, dtype ),
-               self.i18n.translate(
-                       string.format( "stat_dg_label_%s_%s", plugin, pinst ),
-                       self.i18n.translate(
-                               string.format( "stat_dg_label_%s__%s", plugin, dtype ),
-                               self.i18n.translate(
-                                       string.format( "stat_dg_label_%s", plugin ),
-                                       self.graph:_mkpath( plugin, pinst, dtype )
-                               )
-                       )
-               )
-       )
+function Instance.label( self, plugin, pinst, dtype, dinst, user_label )
+
+       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,
@@ -93,13 +85,13 @@ end
 
 function Instance.ds( self, source )
 
-       local label = self.i18n.translate(
+       local label = source.title or self:_translate(
                string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ),
-               self.i18n.translate(
+               self:_translate(
                        string.format( "stat_ds_%s_%s", source.type, source.instance ),
-                       self.i18n.translate(
+                       self:_translate(
                                string.format( "stat_ds_label_%s__%s", source.type, source.ds ),
-                               self.i18n.translate(
+                               self:_translate(
                                        string.format( "stat_ds_%s", source.type ),
                                        source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds
                                )
@@ -112,4 +104,5 @@ function Instance.ds( self, source )
                dinst = source.instance,
                dsrc  = source.ds
        } )
+
 end