luci-0.11: merge outstanding trunk changes

[project/luci.git] / applications / luci-polipo / luasrc / controller / polipo.lua

diff --git a/applications/luci-polipo/luasrc/controller/polipo.lua b/applications/luci-polipo/luasrc/controller/polipo.lua
index aa8c9bf8a36633b6d1f013d06f1a6ad40be70c6e..1113f8f267d1fe7fdb4cf00db0db3e645db3503a 100644 (file)
--- a/applications/luci-polipo/luasrc/controller/polipo.lua
+++ b/applications/luci-polipo/luasrc/controller/polipo.lua
@@ -11,18 +11,16 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 module("luci.controller.polipo", package.seeall)
 
 function index()
        if not nixio.fs.access("/etc/config/polipo") then
                return
        end
-       
-       require("luci.i18n")
-       luci.i18n.loadc("polipo")
-       local i18n = luci.i18n.translate
-       
-       local p = entry({"admin", "services", "polipo"}, cbi("polipo"), i18n("Polipo"))
-       p.dependent = true
-       p.i18n = "polipo"
+
+       entry({"admin", "services", "polipo"}, alias("admin", "services", "polipo", "config"), _("Polipo"))
+       entry({"admin", "services", "polipo", "status"}, template("polipo_status"), _("Status"))
+       entry({"admin", "services", "polipo", "config"}, cbi("polipo"), _("Configuration"))
 end
+