diff --git a/assets/lang/en.json b/assets/lang/en.json index e42eb1b..da59091 100644 --- a/assets/lang/en.json +++ b/assets/lang/en.json @@ -55,5 +55,15 @@ "Local Port": "Local Port", "Operation": "Operation", "Confirm": "Confirm", - "Cancel": "Cancel" + "Cancel": "Cancel", + "Token Invalid": "Token invalid", + "Operate Success": "Operate success", + "Operate Failed": "Operate failed", + "Should Check Proxy": "You should check at least one proxy", + "Confirm Remove Proxy": "Confirm to remove proxy ?", + "Operation Confirm": "Operation confirm", + "Param Error": "Param error", + "Frp Client Error": "Frp client error", + "Proxy Exist,": "Proxy name exist", + "Proxy Not Exist": "Proxy name not exist" } \ No newline at end of file diff --git a/assets/lang/zh.json b/assets/lang/zh.json index 3fa43f7..3ed545c 100644 --- a/assets/lang/zh.json +++ b/assets/lang/zh.json @@ -55,5 +55,15 @@ "Local Port": "本地端口", "Operation": "操作", "Confirm": "确定", - "Cancel": "取消" + "Cancel": "取消", + "Token Invalid": "登录信息无效", + "Operate Success": "操作成功", + "Operate Failed": "操作失败", + "Should Check Proxy": "请选中需要操作的代理", + "Confirm Remove Proxy": "确定删除代理?", + "Operation Confirm": "操作确认", + "Param Error": "参数错误", + "Frp Client Error": "Frp客户端错误", + "Proxy Exist": "代理名称重复", + "Proxy Not Exist": "代理名称不存在" } \ No newline at end of file diff --git a/assets/static/js/index-client-info.js b/assets/static/js/index-client-info.js index 3be655f..d0ae52c 100644 --- a/assets/static/js/index-client-info.js +++ b/assets/static/js/index-client-info.js @@ -16,7 +16,7 @@ var loadClientInfo = (function ($) { type: 'none' }).done(function (result) { if (result.success) { - renderCommonInfo(result.data); + renderClientInfo(result.data); } else { layui.layer.msg(result.message); } @@ -25,7 +25,7 @@ var loadClientInfo = (function ($) { }); } - function renderCommonInfo(data) { + function renderClientInfo(data) { data.tcp_mux = i18n[data.tcp_mux]; data.tls_enable = i18n[data.tls_enable]; var html = layui.laytpl($('#clientInfoTemplate').html()).render(data); diff --git a/assets/static/js/index-proxy-list.js b/assets/static/js/index-proxy-list.js index 96a4fb1..15c306c 100644 --- a/assets/static/js/index-proxy-list.js +++ b/assets/static/js/index-proxy-list.js @@ -233,7 +233,7 @@ var loadProxyInfo = (function ($) { if (result.success) { reloadTable(); layui.layer.close(index); - layui.layer.msg('OperateSuccess', function (index) { + layui.layer.msg(i18n['OperateSuccess'], function (index) { layui.layer.close(index); }); } else { @@ -252,11 +252,11 @@ var loadProxyInfo = (function ($) { */ function batchRemovePopup(data) { if (data.length === 0) { - layui.layer.msg('ShouldCheckProxy'); + layui.layer.msg(i18n['ShouldCheckProxy']); return; } - layui.layer.confirm('ConfirmRemoveProxy', { - title: 'OperationConfirm', + layui.layer.confirm(i18n['ConfirmRemoveProxy'], { + title: i18n['OperationConfirm'], btn: [i18n['Confirm'], i18n['Cancel']] }, function (index) { var loading = layui.layer.load(); @@ -269,7 +269,7 @@ var loadProxyInfo = (function ($) { if (result.success) { reloadTable(); layui.layer.close(index); - layui.layer.msg('OperateSuccess', function (index) { + layui.layer.msg(i18n['OperateSuccess'], function (index) { layui.layer.close(index); }); } else { @@ -295,19 +295,16 @@ var loadProxyInfo = (function ($) { * @param result */ function errorMsg(result) { - layui.layer.msg(result.message); - // var reason = i18n['OtherError']; - // if (result.code === 1) - // reason = i18n['ParamError']; - // else if (result.code === 2) - // reason = i18n['SaveError']; - // else if (result.code === 3) - // reason = i18n['FrpServerError']; - // else if (result.code === 4) - // reason = i18n['ProxyExist']; - // else if (result.code === 5) - // reason = i18n['ProxyNotExist']; - // layui.layer.msg(i18n['OperateFailed'] + ',' + reason) + var reason = i18n['OtherError']; + if (result.code === 1) + reason = i18n['ParamError']; + else if (result.code === 2) + reason = i18n['FrpClientError']; + else if (result.code === 3) + reason = i18n['ProxyExist']; + else if (result.code === 4) + reason = i18n['ProxyNotExist']; + layui.layer.msg(i18n['OperateFailed'] + ',' + reason) } return loadProxyInfo; diff --git a/assets/static/js/index.js b/assets/static/js/index.js index 0d1d831..10fe4a6 100644 --- a/assets/static/js/index.js +++ b/assets/static/js/index.js @@ -1,4 +1,3 @@ -var http_port, https_port; (function ($) { $(function () { function init() { diff --git a/assets/templates/index.html b/assets/templates/index.html index 3fd4d52..786210b 100644 --- a/assets/templates/index.html +++ b/assets/templates/index.html @@ -153,7 +153,7 @@