From 70fd928826ce5bf41fb8d85af57184741c48598a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 20:31:15 +0800 Subject: [PATCH] update 03-26 20:31 --- luci-app-ipsec-server/luasrc/controller/ipsec-server.lua | 8 +++++--- .../luasrc/model/cbi/ipsec-server/settings.lua | 2 +- .../ipsec-server/{index.htm => ipsec-server_status.htm} | 0 .../po/zh-cn/{ipsec.po => ipsec-server.po} | 2 +- luci-app-nft-qos/po/el/nft-qos.po | 8 ++++---- .../htdocs/luci-static/resources/view/wizard/initsetup.js | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) rename luci-app-ipsec-server/luasrc/view/ipsec-server/{index.htm => ipsec-server_status.htm} (100%) rename luci-app-ipsec-server/po/zh-cn/{ipsec.po => ipsec-server.po} (98%) diff --git a/luci-app-ipsec-server/luasrc/controller/ipsec-server.lua b/luci-app-ipsec-server/luasrc/controller/ipsec-server.lua index 921c2599c..2c598a535 100644 --- a/luci-app-ipsec-server/luasrc/controller/ipsec-server.lua +++ b/luci-app-ipsec-server/luasrc/controller/ipsec-server.lua @@ -2,7 +2,9 @@ module("luci.controller.ipsec-server", package.seeall) function index() - if not nixio.fs.access("/etc/config/luci-app-ipsec-server") then return end + if not nixio.fs.access("/etc/config/luci-app-ipsec-server") then + return + end entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false entry({"admin", "vpn", "ipsec-server"}, alias("admin", "vpn", "ipsec-server", "settings"), _("IPSec VPN Server"), 49).dependent = false @@ -10,10 +12,10 @@ function index() entry({"admin", "vpn", "ipsec-server", "users"}, cbi("ipsec-server/users"), _("Users Manager"), 20).leaf = true entry({"admin", "vpn", "ipsec-server", "l2tp_user"}, cbi("ipsec-server/l2tp_user")).leaf = true entry({"admin", "vpn", "ipsec-server", "online"}, cbi("ipsec-server/online"), _("L2TP Online Users"), 30).leaf = true - entry({"admin", "vpn", "ipsec-server", "status"}, call("status")).leaf = true + entry({"admin", "vpn", "ipsec-server", "status"}, call("act_status")).leaf = true end -function status() +function act_status() local e = {} e["ipsec_status"] = luci.sys.call("/usr/bin/pgrep ipsec >/dev/null") == 0 e["l2tp_status"] = luci.sys.call("top -bn1 | grep -v grep | grep '/var/etc/xl2tpd' >/dev/null") == 0 diff --git a/luci-app-ipsec-server/luasrc/model/cbi/ipsec-server/settings.lua b/luci-app-ipsec-server/luasrc/model/cbi/ipsec-server/settings.lua index 73c7f24e7..1a296c392 100644 --- a/luci-app-ipsec-server/luasrc/model/cbi/ipsec-server/settings.lua +++ b/luci-app-ipsec-server/luasrc/model/cbi/ipsec-server/settings.lua @@ -1,7 +1,7 @@ local sys = require "luci.sys" m = Map("luci-app-ipsec-server", translate("IPSec VPN Server")) -m.template = "ipsec-server/index" +m.template = "ipsec-server/ipsec-server_status" s = m:section(TypedSection, "service") s.anonymous = true diff --git a/luci-app-ipsec-server/luasrc/view/ipsec-server/index.htm b/luci-app-ipsec-server/luasrc/view/ipsec-server/ipsec-server_status.htm similarity index 100% rename from luci-app-ipsec-server/luasrc/view/ipsec-server/index.htm rename to luci-app-ipsec-server/luasrc/view/ipsec-server/ipsec-server_status.htm diff --git a/luci-app-ipsec-server/po/zh-cn/ipsec.po b/luci-app-ipsec-server/po/zh-cn/ipsec-server.po similarity index 98% rename from luci-app-ipsec-server/po/zh-cn/ipsec.po rename to luci-app-ipsec-server/po/zh-cn/ipsec-server.po index b822a2f03..5c9049e02 100644 --- a/luci-app-ipsec-server/po/zh-cn/ipsec.po +++ b/luci-app-ipsec-server/po/zh-cn/ipsec-server.po @@ -74,4 +74,4 @@ msgid "NOT RUNNING" msgstr "未运行" msgid "RUNNING" -msgstr "运行中" \ No newline at end of file +msgstr "运行中" diff --git a/luci-app-nft-qos/po/el/nft-qos.po b/luci-app-nft-qos/po/el/nft-qos.po index ecc991d50..205610893 100644 --- a/luci-app-nft-qos/po/el/nft-qos.po +++ b/luci-app-nft-qos/po/el/nft-qos.po @@ -1,14 +1,14 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-12-01 16:16+0000\n" -"Last-Translator: Marios Koutsoukis \n" +"PO-Revision-Date: 2022-03-25 12:08+0000\n" +"Last-Translator: MarioK239 \n" "Language-Team: Greek \n" "Language: el\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.4-dev\n" +"X-Generator: Weblate 4.12-dev\n" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 @@ -22,7 +22,7 @@ msgstr "Συλλογή δεδομένων..." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:229 msgid "Comment" -msgstr "" +msgstr "Σχόλιο" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:50 msgid "Default Download Rate" diff --git a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js index ee787315a..b790373a9 100644 --- a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js +++ b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js @@ -71,7 +71,7 @@ return view.extend({ s.tab('firmware', _('Firmware Settings')); - o = s.taboption('firmware', form.Flag, 'autoupgrade_pkg', _('Packages Auto Upgrade')); + o = s.taboption('firmware', form.Flag, 'autoupgrade_pkg', _('Packages Auto Upgrade'),_('谨慎开启')); o.rmempty = false; o = s.taboption('firmware', form.Flag, 'autoupgrade_fm', _('Firmware Upgrade Notice'));