diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/LICENSE b/package/ctcgfw/luci-app-ssr-plus-Jo/LICENSE deleted file mode 100644 index c1c854b909..0000000000 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019-2020 johnrosen1 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile b/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile index 1d28c4b4d5..c024a04e0f 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus-Jo -PKG_VERSION:=148 -PKG_RELEASE:=20200228-5 +PKG_VERSION:=149 +PKG_RELEASE:=20200229-5 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \ @@ -155,7 +155,7 @@ define Package/luci-app-ssr-plus-Jo/install $(INSTALL_DIR) $(1)/ cp -pR ./root/* $(1)/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - cp -pR ./po/zh-cn/ssr-plus.zh-cn.lmo $(1)/usr/lib/lua/luci/i18n/ssr-plus.zh-cn.lmo + po2lmo ./po/zh-cn/ssr-plus.po $(1)/usr/lib/lua/luci/i18n/ssr-plus.zh-cn.lmo endef define Package/luci-app-ssr-plus-Jo/postinst diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/server.lua b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/server.lua index 49614309e8..ffa879d368 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/server.lua +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/server.lua @@ -6,7 +6,7 @@ local shadowsocksr = "shadowsocksr" local uci = luci.model.uci.cursor() local ipkg = require("luci.model.ipkg") -m = Map(shadowsocksr) +m = Map(shadowsocksr, translate("SS/SSR/V2RAY Server")) local type = { "ssr", diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/status.lua b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/status.lua index 9018ec8418..1f6dba6007 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/status.lua +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/status.lua @@ -1,7 +1,7 @@ -- Copyright (C) 2017 yushi studio -- Licensed to the public under the GNU General Public License v3. -local IPK_Version="20200228.148" +local IPK_Version="20200229.149" local m, s, o local redir_run=0 local reudp_run=0 diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/subscription.lua b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/subscription.lua index 84c52b4d04..9fd00a455c 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/subscription.lua +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/model/cbi/shadowsocksr/subscription.lua @@ -36,8 +36,7 @@ end o.default=2 o.rmempty = false -o = s:option(DynamicList, "subscribe_url", translate("Subscribe URL"), - translate("Before subscribing please click below to delete all servers in the subscription")) +o = s:option(DynamicList, "subscribe_url", translate("Subscribe URL")) o.rmempty = true o = s:option(Flag, "proxy", translate("Through proxy update")) diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/cbi/add.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/cbi/add.htm index 12ad10f34d..f84acdd64f 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/cbi/add.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/cbi/add.htm @@ -230,7 +230,7 @@
- 服务器列表 （总计 <%- print(self.des)-%>个节点） + <%:Node list%> （<%:total%>   <%- print(self.des)-%><%:Nodes%>）
<%- local count = 0 -%>
@@ -257,7 +257,7 @@
- 应用 + <%:Apply%> <%- if self.extedit then -%>
-

科学上网
未运行✘

+

<%:Client%>
<%:Not Running%>

@@ -104,7 +104,7 @@
-

国外网站
无法访问✘

+

<%:Visit foreign websites%>
<%:Problem detected%>

@@ -116,7 +116,7 @@
-

国内网站
无法访问✘

+

<%:Visit domestic website%>
<%:Problem detected%>

@@ -128,7 +128,7 @@
-

游戏模式
未运行✘

+

<%:Game Mode%>
<%:Not Running%>

@@ -140,7 +140,7 @@
-

𝐂𝐡𝐢𝐧𝐚𝐃𝐍𝐒
未运行✘

+

𝐂𝐡𝐢𝐧𝐚𝐃𝐍𝐒
<%:Not Running%>

@@ -152,7 +152,7 @@
-

𝙎𝙊𝘾𝙆𝙎⑤
未运行✘

+

𝙎𝙊𝘾𝙆𝙎⑤
<%:Not Running%>

@@ -172,34 +172,34 @@ var tb5 = document.getElementById('SOCKS5_status'); if (data && tb) { if (data.global) { - tb.innerHTML = '<%:Client%>
运行正常✔'; + tb.innerHTML = '<%:Client%>
<%:Running%>'; } else { - tb.innerHTML = '<%:Client%>
未运行✘'; + tb.innerHTML = '<%:Client%>
<%:Not Running%>'; } if (data.google) { - tb1.innerHTML = '国外网站
访问正常✔'; + tb1.innerHTML = '<%:Visit foreign websites%>
<%:Working...%>'; } else { - tb1.innerHTML = '国外网站
无法访问✘'; + tb1.innerHTML = '<%:Visit foreign websites%>
<%:Problem detected%>'; } if (data.baidu) { - tb2.innerHTML = '国内网站
访问正常✔'; + tb2.innerHTML = '<%:Visit domestic website%>
<%:Working...%>'; } else { - tb2.innerHTML = '国内网站
无法访问✘'; + tb2.innerHTML = '<%:Visit domestic website%>
<%:Problem detected%>'; } if (data.game) { - tb3.innerHTML = '游戏模式
运行正常✔'; + tb3.innerHTML = '<%:Game Mode%>
<%:Running%>'; } else { - tb3.innerHTML = '游戏模式
未运行✘'; + tb3.innerHTML = '<%:Game Mode%>
<%:Not Running%>'; } if (data.chinadns) { - tb4.innerHTML = '𝐂𝐡𝐢𝐧𝐚𝐃𝐍𝐒
运行正常✔'; + tb4.innerHTML = '𝐂𝐡𝐢𝐧𝐚𝐃𝐍𝐒
<%:Running%>'; } else { - tb4.innerHTML = '𝐂𝐡𝐢𝐧𝐚𝐃𝐍𝐒
未运行✘'; + tb4.innerHTML = '𝐂𝐡𝐢𝐧𝐚𝐃𝐍𝐒
<%:Not Running%>'; } if (data.SOCKS5 ) { - tb5.innerHTML = '𝙎𝙊𝘾𝙆𝙎5
运行正常✔'; + tb5.innerHTML = '𝙎𝙊𝘾𝙆𝙎5
<%:Running%>'; } else { - tb5.innerHTML = '𝙎𝙊𝘾𝙆𝙎5
未运行✘'; + tb5.innerHTML = '𝙎𝙊𝘾𝙆𝙎5
<%:Not Running%>'; } diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm index 2d058b6656..05a625693c 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm @@ -1,7 +1,8 @@ -
- -

SS/SSR/V2RAY 服务端

+
+ + <%:Running Status%> +