modules/admin-mini: Improvements in PPPoE/PPTP option descriptions

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 37b6ae2..9341b1f 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -272,3 +272,7 @@ link = "Link"
 frag = "Frag."
 rts = "RTS"
 bitrate = "Bitrate"
+
+m_n_keepalive = "automatically reconnect"
+m_n_dialondemand = "disconnect when idle for"
+m_n_pptp_server = "PPTP-Server"

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index fb685c0..eb38d4a 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -276,4 +276,9 @@ m_n_d_firstaddress = "Erste vergebene Adresse"
 m_n_d_numleases = "Anzahl vergebener Adressen"
 
 routingtable = "Routingtabelle"
-wlanscan = "WLAN-Scan"
\ No newline at end of file
+wlanscan = "WLAN-Scan"
+
+
+m_n_keepalive = "automatisch neu verbinden"
+m_n_dialondemand = "trennen bei Inaktivität nach"
+m_n_pptp_server = "PPTP-Server"
\ No newline at end of file

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index dcd93a3..e2d4e3c 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -53,18 +53,19 @@ pwd = s:option(Value, "password", translate("password"))
 pwd:depends("proto", "pppoe")
 pwd:depends("proto", "pptp")
 
-kea = s:option(Value, "keepalive", "Keep-Alive" .. translate("cbi_optional"))
+kea = s:option(Flag, "keepalive", translate("m_n_keepalive"))
 kea:depends("proto", "pppoe")
 kea:depends("proto", "pptp")
 kea.rmempty = true
+kea.enabled = "10"
 
 
-cod = s:option(Value, "demand", "Dial on Demand" .. translate("cbi_optional"))
+cod = s:option(Value, "demand", translate("m_n_dialondemand"), "s")
 cod:depends("proto", "pppoe")
 cod:depends("proto", "pptp")
 cod.rmempty = true
 
-srv = s:option(Value, "server", "PPTP-Server")
+srv = s:option(Value, "server", translate("m_n_pptp_server"))
 srv:depends("proto", "pptp")
 srv.rmempty = true