projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ba1a52
)
* luci/statistics: replace load() with loadc() since german translation is now available
author
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 8 Jun 2008 14:19:26 +0000
(14:19 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 8 Jun 2008 14:19:26 +0000
(14:19 +0000)
applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
patch
|
blob
|
history
applications/luci-statistics/luasrc/model/cbi/luci_statistics/collectd.lua
patch
|
blob
|
history
applications/luci-statistics/luasrc/statistics/i18n.lua
patch
|
blob
|
history
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
2f68071
..
a8265a1
100644
(file)
--- 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
require("luci.statistics.datatree")
-- load language file
- luci.i18n.load
("statistics.en") -- XXX: temporary / replace with loadc(
)
+ luci.i18n.load
c("statistics"
)
-- get rrd data tree
local tree = luci.statistics.datatree.Instance()
-- 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
47014f0
..
ebd2641
100644
(file)
--- 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")
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
--[[
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
8658395
..
9aa642c
100644
(file)
--- 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
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 )
end
function Instance._subst( self, str, val )