From 8267a65f093a0c34f605e7cc67dc0a4efd9a785b Mon Sep 17 00:00:00 2001 From: Zheng Qian Date: Wed, 21 Nov 2018 10:48:32 +0800 Subject: [PATCH] luci-app-aria2: add a button to open ariang Signed-off-by: Zheng Qian --- .../luci-app-aria2/luasrc/controller/aria2.lua | 3 ++- .../luasrc/view/aria2/overview_status.htm | 3 +++ applications/luci-app-aria2/po/pt-br/aria2.po | 10 +++++++--- applications/luci-app-aria2/po/ru/aria2.po | 10 +++++++--- applications/luci-app-aria2/po/sv/aria2.po | 10 +++++++--- applications/luci-app-aria2/po/templates/aria2.pot | 10 +++++++--- applications/luci-app-aria2/po/zh-cn/aria2.po | 10 +++++++--- applications/luci-app-aria2/po/zh-tw/aria2.po | 10 +++++++--- 8 files changed, 47 insertions(+), 19 deletions(-) diff --git a/applications/luci-app-aria2/luasrc/controller/aria2.lua b/applications/luci-app-aria2/luasrc/controller/aria2.lua index 17289305d..56172ec1d 100644 --- a/applications/luci-app-aria2/luasrc/controller/aria2.lua +++ b/applications/luci-app-aria2/luasrc/controller/aria2.lua @@ -34,7 +34,8 @@ function status() local status = { running = (sys.call("pidof aria2c > /dev/null") == 0), yaaw = ipkg.installed("yaaw"), - webui = ipkg.installed("webui-aria2") + webui = ipkg.installed("webui-aria2"), + ariang = (ipkg.installed("ariang") or ipkg.installed("ariang-nginx")) } http.prepare_content("application/json") diff --git a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm index 66db6ce55..34b7b3c64 100644 --- a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm +++ b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm @@ -11,6 +11,9 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin/services/aria2/status")%>', nul if (data.webui) { links += ''; } + if (data.ariang) { + links += ''; + } tb.innerHTML = links; } else { tb.innerHTML = '<%:The Aria2 service is not running.%>'; diff --git a/applications/luci-app-aria2/po/pt-br/aria2.po b/applications/luci-app-aria2/po/pt-br/aria2.po index f66fef3cc..a4b0ed5ac 100644 --- a/applications/luci-app-aria2/po/pt-br/aria2.po +++ b/applications/luci-app-aria2/po/pt-br/aria2.po @@ -41,7 +41,7 @@ msgstr "Aria2" msgid "Aria2 Settings" msgstr "Configurações do Aria2" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:74 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:77 msgid "Aria2 Status" msgstr "Estado do Aria2" @@ -65,7 +65,7 @@ msgstr "Configurações do BitTorrent" msgid "BitTorrent listen port" msgstr "Porta de escuta do BitTorrent" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:76 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:79 msgid "Collecting data..." msgstr "Coletando dados..." @@ -174,6 +174,10 @@ msgstr "Aviso" msgid "Off" msgstr "Desligado" +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15 +msgid "Open AriaNg" +msgstr "" + #: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12 msgid "Open WebUI-Aria2" msgstr "Abrir WebUI-Aria2" @@ -260,7 +264,7 @@ msgstr "Segurança" msgid "Task Settings" msgstr "Configurações das tarefas" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:16 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19 msgid "The Aria2 service is not running." msgstr "O serviço Aria2 está parado." diff --git a/applications/luci-app-aria2/po/ru/aria2.po b/applications/luci-app-aria2/po/ru/aria2.po index 70e7e3729..39f33be73 100644 --- a/applications/luci-app-aria2/po/ru/aria2.po +++ b/applications/luci-app-aria2/po/ru/aria2.po @@ -40,7 +40,7 @@ msgstr "Aria2" msgid "Aria2 Settings" msgstr "Настройка Aria2" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:74 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:77 msgid "Aria2 Status" msgstr "Состояние Aria2" @@ -64,7 +64,7 @@ msgstr "Настройки BitTorrent-а" msgid "BitTorrent listen port" msgstr "Порты BitTorrent-а" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:76 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:79 msgid "Collecting data..." msgstr "Сбор данных..." @@ -172,6 +172,10 @@ msgstr "Заметка" msgid "Off" msgstr "Выключено" +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15 +msgid "Open AriaNg" +msgstr "" + #: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12 msgid "Open WebUI-Aria2" msgstr "Открыть WebUI-Aria2" @@ -248,7 +252,7 @@ msgstr "Секунды" msgid "Task Settings" msgstr "Настройки задач" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:16 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19 msgid "The Aria2 service is not running." msgstr "Aria2 сервис не запущен." diff --git a/applications/luci-app-aria2/po/sv/aria2.po b/applications/luci-app-aria2/po/sv/aria2.po index 9612be892..01e881f20 100644 --- a/applications/luci-app-aria2/po/sv/aria2.po +++ b/applications/luci-app-aria2/po/sv/aria2.po @@ -26,7 +26,7 @@ msgstr "Aria2" msgid "Aria2 Settings" msgstr "Inställningar för Aria2" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:74 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:77 msgid "Aria2 Status" msgstr "Status för Aria2" @@ -48,7 +48,7 @@ msgstr "Inställningar för BitTorrent" msgid "BitTorrent listen port" msgstr "Lyssningsport för BitTorrent" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:76 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:79 msgid "Collecting data..." msgstr "Samlar in data..." @@ -156,6 +156,10 @@ msgstr "Avisering" msgid "Off" msgstr "Av" +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15 +msgid "Open AriaNg" +msgstr "" + #: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12 msgid "Open WebUI-Aria2" msgstr "Öppna WebUI-Aria2" @@ -232,7 +236,7 @@ msgstr "Sek" msgid "Task Settings" msgstr "Inställningar för uppgifter" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:16 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19 msgid "The Aria2 service is not running." msgstr "Aria2-tjänsten körs inte." diff --git a/applications/luci-app-aria2/po/templates/aria2.pot b/applications/luci-app-aria2/po/templates/aria2.pot index b55dd2520..705fd3460 100644 --- a/applications/luci-app-aria2/po/templates/aria2.pot +++ b/applications/luci-app-aria2/po/templates/aria2.pot @@ -26,7 +26,7 @@ msgstr "" msgid "Aria2 Settings" msgstr "" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:74 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:77 msgid "Aria2 Status" msgstr "" @@ -48,7 +48,7 @@ msgstr "" msgid "BitTorrent listen port" msgstr "" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:76 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:79 msgid "Collecting data..." msgstr "" @@ -156,6 +156,10 @@ msgstr "" msgid "Off" msgstr "" +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15 +msgid "Open AriaNg" +msgstr "" + #: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12 msgid "Open WebUI-Aria2" msgstr "" @@ -232,7 +236,7 @@ msgstr "" msgid "Task Settings" msgstr "" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:16 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19 msgid "The Aria2 service is not running." msgstr "" diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po index 1725aff11..30629e7cf 100644 --- a/applications/luci-app-aria2/po/zh-cn/aria2.po +++ b/applications/luci-app-aria2/po/zh-cn/aria2.po @@ -36,7 +36,7 @@ msgstr "Aria2" msgid "Aria2 Settings" msgstr "Aria2 配置" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:74 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:77 msgid "Aria2 Status" msgstr "Aria2 状态" @@ -58,7 +58,7 @@ msgstr "BitTorrent 设置" msgid "BitTorrent listen port" msgstr "BitTorrent 监听端口" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:76 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:79 msgid "Collecting data..." msgstr "正在收集数据..." @@ -166,6 +166,10 @@ msgstr "注意" msgid "Off" msgstr "关闭" +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15 +msgid "Open AriaNg" +msgstr "打开 AriaNg" + #: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12 msgid "Open WebUI-Aria2" msgstr "打开 WebUI-Aria2" @@ -242,7 +246,7 @@ msgstr "秒" msgid "Task Settings" msgstr "任务设置" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:16 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19 msgid "The Aria2 service is not running." msgstr "Aria2 未运行" diff --git a/applications/luci-app-aria2/po/zh-tw/aria2.po b/applications/luci-app-aria2/po/zh-tw/aria2.po index 8e98f698f..691c26eeb 100644 --- a/applications/luci-app-aria2/po/zh-tw/aria2.po +++ b/applications/luci-app-aria2/po/zh-tw/aria2.po @@ -36,7 +36,7 @@ msgstr "Aria2" msgid "Aria2 Settings" msgstr "Aria2 配置" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:74 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:77 msgid "Aria2 Status" msgstr "Aria2 狀態" @@ -58,7 +58,7 @@ msgstr "BitTorrent 設定" msgid "BitTorrent listen port" msgstr "BitTorrent 監聽埠" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:76 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:79 msgid "Collecting data..." msgstr "正在收集資料..." @@ -166,6 +166,10 @@ msgstr "注意" msgid "Off" msgstr "關閉" +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15 +msgid "Open AriaNg" +msgstr "開啟 AriaNg" + #: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12 msgid "Open WebUI-Aria2" msgstr "開啟 WebUI-Aria2" @@ -242,7 +246,7 @@ msgstr "秒" msgid "Task Settings" msgstr "任務設定" -#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:16 +#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19 msgid "The Aria2 service is not running." msgstr "Aria2 未執行" -- 2.25.1