mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Merge branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2021-04-02 22:46:05 +08:00
commit 305cbdf8c2
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -261,7 +261,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
}
if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
{
statusMessage += '<%:No server IP address, No WAN IP address%>' + '<br/>';
statusMessage += '<%:No server IP address, No public IP address%>' + '<br/>';
}
if (mArray.openmptcprouter.service_addr !== "" && (mArray.openmptcprouter.wan_addr !== "" || mArray.openmptcprouter.wan_addr6 !== "") && mArray.openmptcprouter.vps_status == "DOWN")
{
@ -287,7 +287,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
statusMessage += '<%:Can\'t get public IP address from V2Ray%>' + '<br/>';
} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.external_check == true)
{
statusMessage += '<%:No WAN IP address detected in less than 1 second%>' + '<br/>';
statusMessage += '<%:No public IP address detected in less than 1 second%>' + '<br/>';
}
if (mArray.openmptcprouter.vps_admin == false)
{

10
luci-app-openmptcprouter/po/templates/openmptcprouter.pot
View file

@ -618,10 +618,6 @@ msgstr ""
msgid "No Server ping response after 1 second"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
msgid "No WAN IP address detected in less than 1 second"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:648
msgid "No WAN with multipath enabled:"
msgstr ""
@ -648,8 +644,12 @@ msgstr ""
msgid "No output"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
msgid "No public IP address detected in less than 1 second"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:264
msgid "No server IP address, No WAN IP address"
msgid "No server IP address, No public IP address"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:277