zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2025-12-24 13:28:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Tue Nov 18 19:41:07 CET 2025

Browse Source
This commit is contained in:
github-action[bot]
2025-11-18 19:41:07 +01:00
parent 56abc53ba3
commit accb772624
71 changed files with 889 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openwrt-passwall2/luci-app-passwall2/Makefile
View File

@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=25.11.14
PKG_VERSION:=25.11.18
PKG_RELEASE:=1
PKG_PO_VERSION:=$(PKG_VERSION)

38
openwrt-passwall2/luci-app-passwall2/luasrc/passwall2/api.lua
View File

@@ -1,4 +1,5 @@
module("luci.passwall2.api", package.seeall)
appname = "passwall2"
local com = require "luci.passwall2.com"
bin = require "nixio".bin
fs = require "nixio.fs"
@@ -8,13 +9,8 @@ util = require "luci.util"
datatypes = require "luci.cbi.datatypes"
jsonc = require "luci.jsonc"
i18n = require "luci.i18n"
local lang = uci:get("luci", "main", "lang") or "auto"
if lang == "auto" then
lang = i18n.default
end
i18n.setlanguage(lang)
conf = require "luci.config"
appname = "passwall2"
curl_args = { "-skfL", "--connect-timeout 3", "--retry 3" }
command_timeout = 300
OPENWRT_ARCH = nil
@@ -25,6 +21,16 @@ CACHE_PATH = "/tmp/etc/passwall2_tmp"
TMP_PATH = "/tmp/etc/" .. appname
TMP_IFACE_PATH = TMP_PATH .. "/iface"
local lang = conf.main.lang or "auto"
if lang == "auto" then
local auto_lang = uci:get(appname, "@global[0]", "auto_lang")
if auto_lang then lang = auto_lang end
end
if lang == "auto" then
lang = i18n.default
end
i18n.setlanguage(lang)
function log(...)
local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
local f, err = io.open(LOG_FILE, "a")
@@ -1211,6 +1217,26 @@ function set_apply_on_parse(map)
if not map then
return
end
local lang = conf.main.lang or "auto"
if lang == "auto" then
local http = require "luci.http"
local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
for lpat in aclang:gmatch("[%w-]+") do
lpat = lpat and lpat:gsub("-", "_")
if conf.languages[lpat] then
lang = lpat
break
end
lpat = lpat and lpat:lower()
if conf.languages[lpat] then
lang = lpat
break
end
end
if lang ~= "auto" then
sh_uci_set(appname, "@global[0]", "auto_lang", lang, true)
end
end
if is_js_luci() == true then
local hide_popup_box = nil
if hide_popup_box == true then