From 231d508af37e19115fdc3d5bfd21ea8f282740b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 20:18:48 +0800 Subject: [PATCH] update@20210316 --- luci-app-argon-config/po/es/argon-config.po | 176 ++++++++++++++++++ .../po/templates/argon-config.pot | 155 +++++++++++++++ luci-app-jd-dailybonus/Makefile | 4 +- luci-app-jd-dailybonus/README.md | 5 +- .../luasrc/model/cbi/jd-dailybonus/client.lua | 8 +- .../view/jd-dailybonus/cookie_tools.htm | 59 +++--- .../luasrc/view/admin_network/user_status.htm | 5 +- .../root/etc/uci-defaults/91_luci-oaf | 2 +- 8 files changed, 372 insertions(+), 42 deletions(-) create mode 100644 luci-app-argon-config/po/es/argon-config.po create mode 100644 luci-app-argon-config/po/templates/argon-config.pot diff --git a/luci-app-argon-config/po/es/argon-config.po b/luci-app-argon-config/po/es/argon-config.po new file mode 100644 index 000000000..951ced465 --- /dev/null +++ b/luci-app-argon-config/po/es/argon-config.po @@ -0,0 +1,176 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: 2021-03-15 21:25-0300\n" +"PO-Revision-Date: 2021-03-15 21:58-0300\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.2\n" +"Last-Translator: Franco Castillo \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: es\n" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" +msgstr "" +"0 transparente - 1 opaco; (Sugerencia: negro translúcido preestablecido: 0.5)" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "" +"0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: " +"0.5 )" +msgstr "" +"0 transparente - 1 opaco; (Sugerencia: transparente: 0 o translúcido " +"preestablecido: 0.5)" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "Un color HEX; (Predeterminado: #483d8b)" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "Un color HEX; (Predeterminado: #5e72e4)" + +#: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +msgid "Argon Config" +msgstr "Configuración de Argon" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:195 +msgid "Background file list" +msgstr "Lista de archivos de fondo" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:60 +msgid "Bing Wallpapers" +msgstr "Fondos de Bing" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:59 +msgid "Built-in" +msgstr "Integrado" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:2 +msgid "Choose local file:" +msgstr "Elija un archivo local:" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:149 +msgid "Create upload file error." +msgstr "Crear archivo de error de carga." + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:200 +msgid "File name" +msgstr "Nombre del archivo" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:159 +msgid "File saved to" +msgstr "Archivo guardado en" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:65 +msgid "Follow System" +msgstr "Seguir el sistema" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:67 +msgid "Force Dark" +msgstr "Fuerza oscuro" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:66 +msgid "Force Light" +msgstr "Forzar claro" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +msgid "" +"Here you can set the blur and transparency of the login page of argon theme, " +"and manage the background pictures and videos.[Chrome is recommended]" +msgstr "" +"Aquí puede configurar el desenfoque y la transparencia de la página de " +"inicio de sesión del tema argon y administrar las imágenes de fondo y los " +"videos. [Se recomienda Chrome]" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "" +"Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" +msgstr "" +"El valor más grande se verá más borroso; (Sugerencia: claro: 1 o desenfoque " +"predeterminado: 10)" + +#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 +msgid "Luci Argon theme config" +msgstr "Configuración del tema Luci Argon" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:201 +msgid "Modify time" +msgstr "Modificar la hora" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:167 +msgid "No specify upload file." +msgstr "No especificar archivo de carga." + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:203 +msgid "Remove" +msgstr "Eliminar" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:110 +msgid "Save Changes" +msgstr "Guardar cambios" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:202 +msgid "Size" +msgstr "Tamaño" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:64 +msgid "Theme mode" +msgstr "Modo del tema" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:4 +msgid "Upload" +msgstr "Cargar" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "Upload (Free:" +msgstr "Cargar (Libre:" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:128 +msgid "Upload file to '/www/luci-static/argon/background/'" +msgstr "Subir archivo a '/www/luci-static/argon/background/'" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:58 +msgid "Wallpaper Source" +msgstr "Fuente del fondo de pantalla" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:70 +msgid "You can choose Theme color mode here" +msgstr "Puede elegir el modo de color del tema aquí" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "" +"You can upload files such as jpg,png,gif,mp4 files, To change the login page " +"background." +msgstr "" +"Puede cargar archivos como jpg, png, gif, mp4, para cambiar el fondo de la " +"página de inicio de sesión." + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "[Dark mode] Frosted Glass Radius" +msgstr "[Modo oscuro] Radio de vidrio esmerilado" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "[Dark mode] Primary Color" +msgstr "[Modo oscuro] Color primario" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "[Dark mode] Transparency" +msgstr "[Modo oscuro] Transparencia" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +msgid "[Light mode] Frosted Glass Radius" +msgstr "[Modo claro] Radio de vidrio esmerilado" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "[Light mode] Primary Color" +msgstr "[Modo claro] Color primario" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "[Light mode] Transparency" +msgstr "[Modo claro] Transparencia" diff --git a/luci-app-argon-config/po/templates/argon-config.pot b/luci-app-argon-config/po/templates/argon-config.pot new file mode 100644 index 000000000..b078a8a09 --- /dev/null +++ b/luci-app-argon-config/po/templates/argon-config.pot @@ -0,0 +1,155 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "" +"0 transparent - 1 opaque ; ( Suggest: transparent: 0 or translucent preset: " +"0.5 )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "A HEX Color ; ( Default: #483d8b )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "A HEX Color ; ( Default: #5e72e4 )" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +msgid "Argon Config" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:195 +msgid "Background file list" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:60 +msgid "Bing Wallpapers" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:59 +msgid "Built-in" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:2 +msgid "Choose local file:" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:149 +msgid "Create upload file error." +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:200 +msgid "File name" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:159 +msgid "File saved to" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:65 +msgid "Follow System" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:67 +msgid "Force Dark" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:66 +msgid "Force Light" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:53 +msgid "" +"Here you can set the blur and transparency of the login page of argon theme, " +"and manage the background pictures and videos.[Chrome is recommended]" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "" +"Larger value will more blurred ; ( Suggest: clear: 1 or blur preset: 10 )" +msgstr "" + +#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 +msgid "Luci Argon theme config" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:201 +msgid "Modify time" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:167 +msgid "No specify upload file." +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:203 +msgid "Remove" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:110 +msgid "Save Changes" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:202 +msgid "Size" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:64 +msgid "Theme mode" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/view/argon-config/other_upload.htm:4 +msgid "Upload" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "Upload (Free:" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:128 +msgid "Upload file to '/www/luci-static/argon/background/'" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:58 +msgid "Wallpaper Source" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:70 +msgid "You can choose Theme color mode here" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:124 +msgid "" +"You can upload files such as jpg,png,gif,mp4 files, To change the login page " +"background." +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:105 +msgid "[Dark mode] Frosted Glass Radius" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:92 +msgid "[Dark mode] Primary Color" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:97 +msgid "[Dark mode] Transparency" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:87 +msgid "[Light mode] Frosted Glass Radius" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:72 +msgid "[Light mode] Primary Color" +msgstr "" + +#: applications/luci-app-argon-config/luasrc/model/cbi/argon-config/configuration.lua:79 +msgid "[Light mode] Transparency" +msgstr "" diff --git a/luci-app-jd-dailybonus/Makefile b/luci-app-jd-dailybonus/Makefile index ae5314962..0c173bc21 100644 --- a/luci-app-jd-dailybonus/Makefile +++ b/luci-app-jd-dailybonus/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-jd-dailybonus -PKG_VERSION:=1.0.4 -PKG_RELEASE:=20210315 +PKG_VERSION:=1.0.5 +PKG_RELEASE:=20210316 define Package/$(PKG_NAME)/conffiles /etc/config/jd-dailybonus diff --git a/luci-app-jd-dailybonus/README.md b/luci-app-jd-dailybonus/README.md index 0e8d62e2c..7dfb89f41 100644 --- a/luci-app-jd-dailybonus/README.md +++ b/luci-app-jd-dailybonus/README.md @@ -4,12 +4,11 @@ Luci for JD dailybonus Script for Openwrt -### Update Log 2021-03-15 v1.0.4 +### Update Log 2021-03-16 v1.0.5 #### Updates -- UPD: 增加更多账号功能，双击cookie输入框即可调出二维码，扫码自动填入。【感谢[maple's sky](https://github.com/maplesky)】 - +- FIX: 修正新的PR依赖jQuery的问题。 详情见[具体日志](./relnotes.txt)。 diff --git a/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua b/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua index 50927d0af..8caa7e1a4 100644 --- a/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua +++ b/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua @@ -8,14 +8,14 @@ m = Map(jd) s = m:section(TypedSection, 'global', translate('基本设置')) s.anonymous = true -o = s:option(DummyValue, '', '') -o.rawhtml = true -o.template = 'jd-dailybonus/cookie_tools' - o = s:option(DynamicList, "Cookies", translate("账号 Cookie 列表")) o.rmempty = false o.description = translate('双击输入框即可调出二维码，扫描后自动填入。') +o = s:option(DummyValue, '', '') +o.rawhtml = true +o.template = 'jd-dailybonus/cookie_tools' + o = s:option(Value, 'stop', translate('延迟签到')) o.rmempty = false o.default = 0 diff --git a/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm index efd1e6c92..d2edd25cb 100644 --- a/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm +++ b/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm @@ -81,9 +81,11 @@

二维码已失效

diff --git a/luci-app-oaf/luasrc/view/admin_network/user_status.htm b/luci-app-oaf/luasrc/view/admin_network/user_status.htm index cf0834e7e..304b6c10b 100755 --- a/luci-app-oaf/luasrc/view/admin_network/user_status.htm +++ b/luci-app-oaf/luasrc/view/admin_network/user_status.htm @@ -108,13 +108,16 @@ tr.insertCell(-1).innerHTML = hostname; tr.insertCell(-1).innerHTML = ""+devlist[i].mac+"'>"+devlist[i].mac+""; tr.insertCell(-1).innerHTML = devlist[i].ip; - var app_list_str="--"; + var app_list_str=""; for (var j = 0; j < devlist[i].applist.length; j++){ console.log(devlist[i].applist[j].name); app_list_str+=devlist[i].applist[j].name; if (j != devlist[i].applist.length - 1) app_list_str+="," } + if(app_list_str == ""){ + app_list_str="--" + } tr.insertCell(-1).innerHTML = app_list_str; } } diff --git a/luci-app-oaf/root/etc/uci-defaults/91_luci-oaf b/luci-app-oaf/root/etc/uci-defaults/91_luci-oaf index 2041cc3df..19006565d 100755 --- a/luci-app-oaf/root/etc/uci-defaults/91_luci-oaf +++ b/luci-app-oaf/root/etc/uci-defaults/91_luci-oaf @@ -4,7 +4,7 @@ uci -q batch <<-EOF >/dev/null del ucitrack.@appfilter[-1] add ucitrack appfilter - set ucitrack.@appfilter[-1].exec="/etc/init.d/appfilter reload" + set ucitrack.@appfilter[-1].exec="/etc/init.d/appfilter restart" commit ucitrack EOF