summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2008-06-08 14:19:26 +0000
committerJo-Philipp Wich <jow@openwrt.org>2008-06-08 14:19:26 +0000
commit873b20cb19ed91957217ebc5284dc86658042100 (patch)
treecc356a313ef90d2a5e499262b8dc622bb25cfbc6
parent3ba1a52c1f9c7d0fef0807afe7e79a0d0ef53660 (diff)
* luci/statistics: replace load() with loadc() since german translation is now available
-rw-r--r--applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua2
-rw-r--r--applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua2
-rw-r--r--applications/luci-statistics/luasrc/statistics/i18n.lua3
3 files changed, 2 insertions, 5 deletions
diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index 2f6807153..a8265a163 100644
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -22,7 +22,7 @@ function index()
require("luci.statistics.datatree")
-- load language file
- luci.i18n.load("statistics.en") -- XXX: temporary / replace with loadc()
+ luci.i18n.loadc("statistics")
-- get rrd data tree
local tree = luci.statistics.datatree.Instance()
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
index 47014f033..ebd264154 100644
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
+++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
@@ -16,8 +16,6 @@ $Id$
require("luci.sys")
-luci.i18n.load("statistics.en")
-
--[[
m = Map("luci_statistics", "Collector Daemon",
Collectd ist ein kleiner und flexibler Dienst zum Sammeln und Abfragen von Daten
diff --git a/applications/luci-statistics/luasrc/statistics/i18n.lua b/applications/luci-statistics/luasrc/statistics/i18n.lua
index 865839524..9aa642c34 100644
--- a/applications/luci-statistics/luasrc/statistics/i18n.lua
+++ b/applications/luci-statistics/luasrc/statistics/i18n.lua
@@ -26,8 +26,7 @@ function Instance.__init__( self, graph )
self.i18n = luci.i18n
self.graph = graph
- -- XXX: compat hack
- self.i18n.load("statistics.en")
+ self.i18n.loadc("statistics")
end
function Instance._subst( self, str, val )