X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-statistics%2Fluasrc%2Fstatistics%2Fi18n.lua;h=213131bd318a29246fcb24cbb9f49929e1b5e87a;hb=45d9fe0b165467b808bf2fa56edb9e9ebaa89c7b;hp=a31d126676db49c482ce6ca0149d208d87713734;hpb=b06638df6e776fc380687b06924a77b03055c00e;p=project%2Fluci.git

diff --git a/applications/luci-statistics/luasrc/statistics/i18n.lua b/applications/luci-statistics/luasrc/statistics/i18n.lua
index a31d12667..213131bd3 100644
--- a/applications/luci-statistics/luasrc/statistics/i18n.lua
+++ b/applications/luci-statistics/luasrc/statistics/i18n.lua
@@ -1,3 +1,18 @@
+--[[
+
+Luci statistics - diagram i18n helper
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+]]--
+
 module("luci.statistics.i18n", package.seeall)
 
 require("luci.util")
@@ -11,8 +26,8 @@ function Instance.__init__( self, graph )
 	self.i18n  = luci.i18n
 	self.graph = graph
 
-	-- XXX: compat hack
-	self.i18n.load("statistics.en")
+	self.i18n.loadc("rrdtool")
+	self.i18n.loadc("statistics")
 end
 
 function Instance._subst( self, str, val )
@@ -28,13 +43,13 @@ end
 
 function Instance.title( self, plugin, pinst, dtype, dinst )
 
-	local title = self.i18n.translate(
+	local title = self.i18n.string(
 		string.format( "stat_dg_title_%s_%s_%s", plugin, pinst, dtype ),
-		self.i18n.translate(
+		self.i18n.string(
 			string.format( "stat_dg_title_%s_%s", plugin, pinst ),
-			self.i18n.translate(
+			self.i18n.string(
 				string.format( "stat_dg_title_%s__%s", plugin, dtype ),
-				self.i18n.translate(
+				self.i18n.string(
 					string.format( "stat_dg_title_%s", plugin ),
 					self.graph:_mkpath( plugin, pinst, dtype )
 				)
@@ -42,7 +57,7 @@ function Instance.title( self, plugin, pinst, dtype, dinst )
 		)
 	)
 
-	return self:_subst( title, { 
+	return self:_subst( title, {
 		plugin = plugin,
 		pinst  = pinst,
 		dtype  = dtype,
@@ -53,13 +68,13 @@ end
 
 function Instance.label( self, plugin, pinst, dtype, dinst )
 
-	local label = self.i18n.translate(
+	local label = self.i18n.string(
 		string.format( "stat_dg_label_%s_%s_%s", plugin, pinst, dtype ),
-		self.i18n.translate(
+		self.i18n.string(
 			string.format( "stat_dg_label_%s_%s", plugin, pinst ),
-			self.i18n.translate(
+			self.i18n.string(
 				string.format( "stat_dg_label_%s__%s", plugin, dtype ),
-				self.i18n.translate(
+				self.i18n.string(
 					string.format( "stat_dg_label_%s", plugin ),
 					self.graph:_mkpath( plugin, pinst, dtype )
 				)
@@ -67,7 +82,7 @@ function Instance.label( self, plugin, pinst, dtype, dinst )
 		)
 	)
 
-	return self:_subst( label, { 
+	return self:_subst( label, {
 		plugin = plugin,
 		pinst  = pinst,
 		dtype  = dtype,
@@ -78,13 +93,13 @@ end
 
 function Instance.ds( self, source )
 
-	local label = self.i18n.translate(
+	local label = self.i18n.string(
 		string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ),
-		self.i18n.translate(
+		self.i18n.string(
 			string.format( "stat_ds_%s_%s", source.type, source.instance ),
-			self.i18n.translate(
+			self.i18n.string(
 				string.format( "stat_ds_label_%s__%s", source.type, source.ds ),
-				self.i18n.translate(
+				self.i18n.string(
 					string.format( "stat_ds_%s", source.type ),
 					source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds
 				)
@@ -92,7 +107,7 @@ function Instance.ds( self, source )
 		)
 	)
 
-	return self:_subst( label, { 
+	return self:_subst( label, {
 		dtype = source.type,
 		dinst = source.instance,
 		dsrc  = source.ds