X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-olsr%2Fluasrc%2Fcontroller%2Folsr.lua;h=d478df058dba30493b26da42da25812e48c78cdb;hp=0482a8fe70fa33875f0f0732bb827f69318d742d;hb=4f2bf621beff771fb069b31880be36c13ef76c4c;hpb=932280107232706c4605e475a6d969f0adf2e22d

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index 0482a8fe7..d478df058 100644
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -1,18 +1,26 @@
 module("luci.controller.olsr", package.seeall)
 
 function index()
+	if not luci.fs.isfile("/etc/config/olsr") then
+		return
+	end
+	
+	require("luci.i18n").loadc("olsr")
+	local i18n = luci.i18n.translate
+	
 	local page  = node("admin", "status", "olsr")
 	page.target = call("action_index")
 	page.title  = "OLSR"
+	page.i18n   = "olsr"
 	
 	local page  = node("admin", "status", "olsr", "routes")
 	page.target = call("action_routes")
-	page.title  = "Routen"
+	page.title  = i18n("olsr_routes", "Routen")
 	page.order  = 10
 	
 	local page  = node("admin", "status", "olsr", "topology")
 	page.target = call("action_topology")
-	page.title  = "Topologie"
+	page.title  = i18n("olsr_topology", "Topologie")
 	page.order  = 20
 	
 	local page  = node("admin", "status", "olsr", "hna")
@@ -25,7 +33,7 @@ function index()
 	page.title  = "MID"
 	page.order  = 50
 
-	entry({"admin", "services", "olsrd"}, cbi("olsr/olsrd.lua"), "OLSRd")
+	entry({"admin", "services", "olsrd"}, cbi("olsr/olsrd"), "OLSR").i18n = "olsr"
 end
 
 function action_index()
@@ -149,15 +157,23 @@ function fetch_txtinfo(otable)
 		local lines = luci.util.split(tbl, "\n")
 		local name  = table.remove(lines, 1):sub(8)
 		local keys  = luci.util.split(table.remove(lines, 1), "\t")
+		local split = #keys - 1
 		
 		data[name] = {}
 		
 		for j, line in ipairs(lines) do
-			local fields = luci.util.split(line, "\t")
+			local fields = luci.util.split(line, "\t", split)
 			data[name][j] = {}
 			for k, key in pairs(keys) do
 				data[name][j][key] = fields[k] 
 			end
+			
+			if data[name][j].Linkcost then
+				data[name][j].LinkQuality,
+				data[name][j].NLQ,
+				data[name][j].ETX =
+				 data[name][j].Linkcost:match("(.*)/(.*)\t(.*)")
+			end
 		end
 	end