From 52657d20d1071ee782e0813a62cbee65e8061b06 Mon Sep 17 00:00:00 2001 From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> Date: Sat, 23 Apr 2022 05:22:30 +0000 Subject: [PATCH 1/2] tidy up code --- Makefile | 2 +- luasrc/controller/argon-config.lua | 7 ++----- po/zh-cn/argon-config.po | 4 ---- po/zh_Hans | 1 + root/etc/config/argon | 2 +- root/usr/share/rpcd/acl.d/luci-app-argon-config.json | 6 +++--- 6 files changed, 8 insertions(+), 14 deletions(-) create mode 120000 po/zh_Hans diff --git a/Makefile b/Makefile index 618a111..f85f53e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-argon-config PKG_VERSION:=0.9 -PKG_RELEASE:=20210904 +PKG_RELEASE:=20220423 PKG_MAINTAINER:=jerrykuku diff --git a/luasrc/controller/argon-config.lua b/luasrc/controller/argon-config.lua index 68bff28..5d7faf4 100644 --- a/luasrc/controller/argon-config.lua +++ b/luasrc/controller/argon-config.lua @@ -1,7 +1,3 @@ ---[[ -luci-app-argon-config -]]-- - module("luci.controller.argon-config", package.seeall) function index() @@ -9,5 +5,6 @@ function index() return end - entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90) + local page = entry({"admin", "system", "argon-config"}, form("argon-config"), _("Argon Config"), 90) + page.acl_depends = { "luci-app-argon-config" } end diff --git a/po/zh-cn/argon-config.po b/po/zh-cn/argon-config.po index 1d25348..b05bce0 100644 --- a/po/zh-cn/argon-config.po +++ b/po/zh-cn/argon-config.po @@ -56,9 +56,6 @@ msgstr "十六进制颜色值 ( 预设为：#483d8b )" msgid "[Light mode] Transparency" msgstr "[亮色模式] 透明度" -msgid "[Light mode] Transparency" -msgstr "[亮色模式] 透明度" - msgid "[Dark mode] Transparency" msgstr "[暗色模式] 透明度" @@ -92,7 +89,6 @@ msgstr "无法打开文件：" msgid "Create upload file error." msgstr "创建上传文件失败。" - msgid "File name" msgstr "文件名" diff --git a/po/zh_Hans b/po/zh_Hans new file mode 120000 index 0000000..41451e4 --- /dev/null +++ b/po/zh_Hans @@ -0,0 +1 @@ +zh-cn \ No newline at end of file diff --git a/root/etc/config/argon b/root/etc/config/argon index c5d6313..fb7f35d 100644 --- a/root/etc/config/argon +++ b/root/etc/config/argon @@ -6,4 +6,4 @@ config global option transparency '0.5' option transparency_dark '0.5' option mode 'normal' - option bing_background '0' \ No newline at end of file + option bing_background '0' diff --git a/root/usr/share/rpcd/acl.d/luci-app-argon-config.json b/root/usr/share/rpcd/acl.d/luci-app-argon-config.json index b237aff..f0a3137 100644 --- a/root/usr/share/rpcd/acl.d/luci-app-argon-config.json +++ b/root/usr/share/rpcd/acl.d/luci-app-argon-config.json @@ -1,6 +1,6 @@ { - "luci-argon-config": { - "description": "Luci Argon theme config ", + "luci-app-argon-config": { + "description": "Grant UCI access for luci-app-argon-config", "read": { "uci": [ "argon" ] }, @@ -8,4 +8,4 @@ "uci": [ "argon" ] } } -} \ No newline at end of file +} From 2ff895a1271684e33e06752232c78091c529346c Mon Sep 17 00:00:00 2001 From: Franco Castillo Date: Sat, 23 Apr 2022 15:23:55 -0300 Subject: [PATCH 2/2] Update argon-config.pot and Spanish translation Signed-off-by: Franco Castillo --- po/es/argon-config.po | 25 ++++++++++++++----------- po/templates/argon-config.pot | 10 +++++----- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/po/es/argon-config.po b/po/es/argon-config.po index d5c178a..7ec7b80 100644 --- a/po/es/argon-config.po +++ b/po/es/argon-config.po @@ -1,16 +1,16 @@ 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" +"PO-Revision-Date: 2022-04-23 15:21-0300\n" +"Last-Translator: Franco Castillo \n" "Language-Team: \n" +"Language: es\n" "MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\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" +"X-Generator: Poedit 3.0.1\n" #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:97 msgid "0 transparent - 1 opaque ; ( Suggest: Black translucent preset: 0.5 )" @@ -33,7 +33,7 @@ msgstr "Un color HEX; (Predeterminado: #483d8b)" 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/controller/argon-config.lua:8 #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 msgid "Argon Config" msgstr "Configuración de Argon" @@ -72,12 +72,16 @@ msgstr "Seguir el sistema" #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:67 msgid "Force Dark" -msgstr "Fuerza oscuro" +msgstr "Forzar oscuro" #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:66 msgid "Force Light" msgstr "Forzar claro" +#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 +msgid "Grant UCI access for luci-app-argon-config" +msgstr "Otorgar acceso UCI para luci-app-argon-config" + #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 msgid "" "Here you can set the blur and transparency of the login page of argon theme, " @@ -95,10 +99,6 @@ 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.lua:201 msgid "Modify time" msgstr "Modificar la hora" @@ -174,3 +174,6 @@ msgstr "[Modo claro] Color primario" #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:79 msgid "[Light mode] Transparency" msgstr "[Modo claro] Transparencia" + +#~ msgid "Luci Argon theme config" +#~ msgstr "Configuración del tema Luci Argon" diff --git a/po/templates/argon-config.pot b/po/templates/argon-config.pot index c74c18f..6724c46 100644 --- a/po/templates/argon-config.pot +++ b/po/templates/argon-config.pot @@ -19,7 +19,7 @@ msgstr "" msgid "A HEX Color ; ( Default: #5e72e4 )" msgstr "" -#: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:11 +#: applications/luci-app-argon-config/luasrc/controller/argon-config.lua:8 #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 msgid "Argon Config" msgstr "" @@ -64,6 +64,10 @@ msgstr "" msgid "Force Light" msgstr "" +#: applications/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json:3 +msgid "Grant UCI access for luci-app-argon-config" +msgstr "" + #: applications/luci-app-argon-config/luasrc/model/cbi/argon-config.lua:53 msgid "" "Here you can set the blur and transparency of the login page of argon theme, " @@ -76,10 +80,6 @@ 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.lua:201 msgid "Modify time" msgstr ""