- fixed path to OpenVPN PID file

- fixed syntax for translatef call

diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
index e71becd06c689c24de7a1b9ccd2304b316d62999..c220b10a56ee60e03368527dbe294da6dca8d28b 100644 (file)
--- a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua
@@ -70,10 +70,10 @@ s:option( Flag, "enable", translate("openvpn_enable") )
 
 local active = s:option( DummyValue, "_active", translate("openvpn_active") )
 function active.cfgvalue(self, section)
-       local pid = fs.readfile("/var/run/openvpn_%s.pid" % section)
+       local pid = fs.readfile("/var/run/openvpn-%s.pid" % section)
        if pid and #pid > 0 and tonumber(pid) ~= nil then
                return (sys.process.signal(pid, 0))
-                       and translatef("openvpn_active_yes", pid)
+                       and translatef("openvpn_active_yes", "yes (%i)", pid)
                        or  translate("openvpn_active_no")
        end
        return translate("openvpn_active_no")