From b06638df6e776fc380687b06924a77b03055c00e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 28 May 2008 22:34:26 +0000 Subject: * luci/statistics: implement initial i18n support, added first translations, removed hardcoded strings from models --- .../statistics/rrdtool/definitions/cpu/cpu.lua | 7 ++--- .../statistics/rrdtool/definitions/interface.lua | 12 --------- .../rrdtool/definitions/iptables/ipt_packets.lua | 5 +--- .../statistics/rrdtool/definitions/netlink.lua | 30 ---------------------- .../statistics/rrdtool/definitions/ping/ping.lua | 3 --- .../rrdtool/definitions/processes/ps_state.lua | 3 --- .../definitions/tcpconns/tcp_connections.lua | 9 ------- .../statistics/rrdtool/definitions/wireless.lua | 12 --------- 8 files changed, 3 insertions(+), 78 deletions(-) (limited to 'applications/luci-statistics/luasrc/statistics/rrdtool/definitions') diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua index 5a2ac53ca7..bd002e12fa 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/cpu/cpu.lua @@ -3,12 +3,9 @@ module("luci.statistics.rrdtool.definitions.cpu.cpu",package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) return { - title = "Prozessorauslastung", - vlabel = "%", - data = { - instances = { - cpu = { "idle", "nice", "system", "user" } + instances = { + cpu = { "idle", "user", "system", "nice" } }, options = { diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua index 1b61ad68ec..0d812d6ec7 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/interface.lua @@ -7,12 +7,6 @@ function rrdargs( graph, host, plugin, plugin_instance ) -- local traffic = { - -- diagram title - title = "Verkehr", - - -- vertical label - vlabel = "Bytes/s", - -- draw this diagram for each data instance per_instance = true, @@ -45,12 +39,6 @@ function rrdargs( graph, host, plugin, plugin_instance ) -- local packets = { - -- diagram title - title = "Pakete", - - -- vertical label - vlabel = "Pakete/s", - -- draw this diagram for each data instance per_instance = true, diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua index 4551073225..2ab57e8622 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/iptables/ipt_packets.lua @@ -3,10 +3,7 @@ module("luci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeal function rrdargs( graph, plugin, plugin_instance, dtype ) return { - title = "Firewall", - vlabel = "Pakete/s", - - data = { + data = { options = { ipt_packets = { total = true } } diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua index 47594f0f80..8f32ab3d1e 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua @@ -7,12 +7,6 @@ function rrdargs( graph, plugin, plugin_instance ) -- local traffic = { - -- diagram title - title = "Verkehr", - - -- vertical label - vlabel = "Bytes/s", - -- diagram data description data = { -- defined sources for data types, if ommitted assume a single DS named "value" (optional) @@ -42,12 +36,6 @@ function rrdargs( graph, plugin, plugin_instance ) -- local packets = { - -- diagram title - title = "Pakete", - - -- vertical label - vlabel = "Pakete/s", - -- diagram data description data = { -- data type order @@ -116,12 +104,6 @@ function rrdargs( graph, plugin, plugin_instance ) -- local multicast = { - -- diagram title - title = "Multicast-Pakete", - - -- vertical label - vlabel = "Pakete/s", - -- diagram data description data = { -- data type order @@ -144,12 +126,6 @@ function rrdargs( graph, plugin, plugin_instance ) -- local collisions = { - -- diagram title - title = "Paketkollisionen", - - -- vertical label - vlabel = "Kollisionen/s", - -- diagram data description data = { -- data type order @@ -172,12 +148,6 @@ function rrdargs( graph, plugin, plugin_instance ) -- local errors = { - -- diagram title - title = "TX/RX-Fehler", - - -- vertical label - vlabel = "Kollisionen/s", - -- diagram data description data = { -- data type order diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua index cf1db00b41..a7bf2956cf 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping/ping.lua @@ -3,9 +3,6 @@ module("luci.statistics.rrdtool.definitions.ping.ping", package.seeall) function rrdargs( graph, plugin, plugin_instance, dtype ) return { - title = "Pingzeiten", - vlabel = "ms", - data = { sources = { ping = { "ping" } diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes/ps_state.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes/ps_state.lua index 715d19c763..5dd446f311 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes/ps_state.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes/ps_state.lua @@ -3,9 +3,6 @@ module("luci.statistics.rrdtool.definitions.processes.ps_state", package.seeall) function rrdargs( graph, plugin, plugin_instance, dtype ) return { - title = "Prozesse", - vlabel = "Anzahl/s", - data = { instances = { ps_state = { diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua index c944d990d2..7f54c10914 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua @@ -3,9 +3,6 @@ module("luci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.s function rrdargs( graph, plugin, plugin_instance, dtype ) return { - title = "TCP-Verbindungen auf Port " .. plugin_instance, - vlabel = "Anzahl/s", - data = { instances = { tcp_connections = { @@ -13,12 +10,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) "LAST_ACK", "TIME_WAIT", "CLOSING", "CLOSE_WAIT", "CLOSED", "FIN_WAIT1", "FIN_WAIT2" } - }, - - options = { - tcp_connections = { - total = true - } } } } diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua index 6c68bb2698..7c08885583 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/wireless.lua @@ -7,12 +7,6 @@ function rrdargs( graph, host, plugin, plugin_instance ) -- local snr = { - -- diagram title - title = "Signal / Noise", - - -- vertical label - vlabel = "dBm", - -- draw this diagram for each data instance per_instance = true, @@ -41,12 +35,6 @@ function rrdargs( graph, host, plugin, plugin_instance ) -- local quality = { - -- diagram title - title = "Signalqualitaet", - - -- vertical label - vlabel = "n/5", - -- draw this diagram for each data instance per_instance = true, -- cgit v1.2.3