mirror of https://github.com/jumpserver/jumpserver
fix: 修改测试网关端口错误时提示信息
Michael Bai
Jiangjie.Bai
parent
17a5e919d5
commit
84d6b3de26
|
|
@ -120,6 +120,7 @@ class Gateway(BaseUser):
|
|||
except(paramiko.AuthenticationException,
|
||||
paramiko.BadAuthenticationType,
|
||||
paramiko.SSHException,
|
||||
paramiko.ChannelException,
|
||||
paramiko.ssh_exception.NoValidConnectionsError,
|
||||
socket.gaierror) as e:
|
||||
err = str(e)
|
||||
|
|
@ -128,6 +129,8 @@ class Gateway(BaseUser):
|
|||
err = err.format(port=self.port, ip=self.ip)
|
||||
elif err == 'Authentication failed.':
|
||||
err = _('Authentication failed')
|
||||
elif err == 'Connect failed':
|
||||
err = _('Connect failed')
|
||||
self.is_connective = False
|
||||
return False, err
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: JumpServer 0.3.3\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-09-13 17:05+0800\n"
|
||||
"POT-Creation-Date: 2021-09-13 18:46+0800\n"
|
||||
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
|
||||
"Last-Translator: ibuler <ibuler@qq.com>\n"
|
||||
"Language-Team: JumpServer team<ibuler@qq.com>\n"
|
||||
|
|
@ -375,7 +375,7 @@ msgstr "目标URL"
|
|||
#: applications/serializers/attrs/application_type/custom.py:25
|
||||
#: applications/serializers/attrs/application_type/mysql_workbench.py:34
|
||||
#: applications/serializers/attrs/application_type/vmware_client.py:30
|
||||
#: assets/models/base.py:177 audits/signals_handler.py:63
|
||||
#: assets/models/base.py:177 audits/signals_handler.py:65
|
||||
#: authentication/forms.py:22
|
||||
#: authentication/templates/authentication/login.html:164
|
||||
#: settings/serializers/auth/ldap.py:44 users/forms/profile.py:21
|
||||
|
|
@ -678,15 +678,19 @@ msgstr "命令复核"
|
|||
msgid "Gateway"
|
||||
msgstr "网关"
|
||||
|
||||
#: assets/models/domain.py:127
|
||||
#: assets/models/domain.py:128
|
||||
#, python-brace-format
|
||||
msgid "Unable to connect to port {port} on {ip}"
|
||||
msgstr "无法连接到 {ip} 上的端口 {port}"
|
||||
|
||||
#: assets/models/domain.py:130
|
||||
#: assets/models/domain.py:131
|
||||
msgid "Authentication failed"
|
||||
msgstr "认证失败"
|
||||
|
||||
#: assets/models/domain.py:133
|
||||
msgid "Connect failed"
|
||||
msgstr "连接失败"
|
||||
|
||||
#: assets/models/gathered_user.py:16
|
||||
msgid "Present"
|
||||
msgstr "存在"
|
||||
|
|
@ -1222,209 +1226,209 @@ msgstr "运行用户名称"
|
|||
msgid "User display"
|
||||
msgstr "用户名称"
|
||||
|
||||
#: audits/signals_handler.py:62
|
||||
#: audits/signals_handler.py:64
|
||||
msgid "SSH Key"
|
||||
msgstr "SSH 密钥"
|
||||
|
||||
#: audits/signals_handler.py:64
|
||||
#: audits/signals_handler.py:66
|
||||
msgid "SSO"
|
||||
msgstr ""
|
||||
|
||||
#: audits/signals_handler.py:65
|
||||
#: audits/signals_handler.py:67
|
||||
msgid "Auth Token"
|
||||
msgstr "认证令牌"
|
||||
|
||||
#: audits/signals_handler.py:66
|
||||
#: audits/signals_handler.py:68
|
||||
#: authentication/templates/authentication/login.html:210
|
||||
#: notifications/backends/__init__.py:11
|
||||
msgid "WeCom"
|
||||
msgstr "企业微信"
|
||||
|
||||
#: audits/signals_handler.py:67
|
||||
#: audits/signals_handler.py:69
|
||||
#: authentication/templates/authentication/login.html:215
|
||||
#: notifications/backends/__init__.py:12
|
||||
msgid "DingTalk"
|
||||
msgstr "钉钉"
|
||||
|
||||
#: audits/signals_handler.py:100
|
||||
#: audits/signals_handler.py:102
|
||||
msgid "User and Organization"
|
||||
msgstr "用户与组织"
|
||||
|
||||
#: audits/signals_handler.py:101
|
||||
#: audits/signals_handler.py:103
|
||||
#, python-brace-format
|
||||
msgid "{User} JOINED {Organization}"
|
||||
msgstr "{User} 加入 {Organization}"
|
||||
|
||||
#: audits/signals_handler.py:102
|
||||
#: audits/signals_handler.py:104
|
||||
#, python-brace-format
|
||||
msgid "{User} LEFT {Organization}"
|
||||
msgstr "{User} 离开 {Organization}"
|
||||
|
||||
#: audits/signals_handler.py:105
|
||||
#: audits/signals_handler.py:107
|
||||
msgid "User and Group"
|
||||
msgstr "用户与用户组"
|
||||
|
||||
#: audits/signals_handler.py:106
|
||||
#: audits/signals_handler.py:108
|
||||
#, python-brace-format
|
||||
msgid "{User} JOINED {UserGroup}"
|
||||
msgstr "{User} 加入 {UserGroup}"
|
||||
|
||||
#: audits/signals_handler.py:107
|
||||
#: audits/signals_handler.py:109
|
||||
#, python-brace-format
|
||||
msgid "{User} LEFT {UserGroup}"
|
||||
msgstr "{User} 离开 {UserGroup}"
|
||||
|
||||
#: audits/signals_handler.py:110
|
||||
#: audits/signals_handler.py:112
|
||||
msgid "Asset and SystemUser"
|
||||
msgstr "资产与系统用户"
|
||||
|
||||
#: audits/signals_handler.py:111
|
||||
#: audits/signals_handler.py:113
|
||||
#, python-brace-format
|
||||
msgid "{Asset} ADD {SystemUser}"
|
||||
msgstr "{Asset} 添加 {SystemUser}"
|
||||
|
||||
#: audits/signals_handler.py:112
|
||||
#: audits/signals_handler.py:114
|
||||
#, python-brace-format
|
||||
msgid "{Asset} REMOVE {SystemUser}"
|
||||
msgstr "{Asset} 移除 {SystemUser}"
|
||||
|
||||
#: audits/signals_handler.py:115
|
||||
#: audits/signals_handler.py:117
|
||||
msgid "Node and Asset"
|
||||
msgstr "节点与资产"
|
||||
|
||||
#: audits/signals_handler.py:116
|
||||
#: audits/signals_handler.py:118
|
||||
#, python-brace-format
|
||||
msgid "{Node} ADD {Asset}"
|
||||
msgstr "{Node} 添加 {Asset}"
|
||||
|
||||
#: audits/signals_handler.py:117
|
||||
#: audits/signals_handler.py:119
|
||||
#, python-brace-format
|
||||
msgid "{Node} REMOVE {Asset}"
|
||||
msgstr "{Node} 移除 {Asset}"
|
||||
|
||||
#: audits/signals_handler.py:120
|
||||
#: audits/signals_handler.py:122
|
||||
msgid "User asset permissions"
|
||||
msgstr "用户资产授权"
|
||||
|
||||
#: audits/signals_handler.py:121
|
||||
#: audits/signals_handler.py:123
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} ADD {User}"
|
||||
msgstr "{AssetPermission} 添加 {User}"
|
||||
|
||||
#: audits/signals_handler.py:122
|
||||
#: audits/signals_handler.py:124
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} REMOVE {User}"
|
||||
msgstr "{AssetPermission} 移除 {User}"
|
||||
|
||||
#: audits/signals_handler.py:125
|
||||
#: audits/signals_handler.py:127
|
||||
msgid "User group asset permissions"
|
||||
msgstr "用户组资产授权"
|
||||
|
||||
#: audits/signals_handler.py:126
|
||||
#: audits/signals_handler.py:128
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} ADD {UserGroup}"
|
||||
msgstr "{AssetPermission} 添加 {UserGroup}"
|
||||
|
||||
#: audits/signals_handler.py:127
|
||||
#: audits/signals_handler.py:129
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} REMOVE {UserGroup}"
|
||||
msgstr "{AssetPermission} 移除 {UserGroup}"
|
||||
|
||||
#: audits/signals_handler.py:130 perms/models/asset_permission.py:106
|
||||
#: audits/signals_handler.py:132 perms/models/asset_permission.py:106
|
||||
#: templates/_nav.html:78 users/templates/users/_user_detail_nav_header.html:31
|
||||
msgid "Asset permission"
|
||||
msgstr "资产授权"
|
||||
|
||||
#: audits/signals_handler.py:131
|
||||
#: audits/signals_handler.py:133
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} ADD {Asset}"
|
||||
msgstr "{AssetPermission} 添加 {Asset}"
|
||||
|
||||
#: audits/signals_handler.py:132
|
||||
#: audits/signals_handler.py:134
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} REMOVE {Asset}"
|
||||
msgstr "{AssetPermission} 移除 {Asset}"
|
||||
|
||||
#: audits/signals_handler.py:135
|
||||
#: audits/signals_handler.py:137
|
||||
msgid "Node permission"
|
||||
msgstr "节点授权"
|
||||
|
||||
#: audits/signals_handler.py:136
|
||||
#: audits/signals_handler.py:138
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} ADD {Node}"
|
||||
msgstr "{AssetPermission} 添加 {Node}"
|
||||
|
||||
#: audits/signals_handler.py:137
|
||||
#: audits/signals_handler.py:139
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} REMOVE {Node}"
|
||||
msgstr "{AssetPermission} 移除 {Node}"
|
||||
|
||||
#: audits/signals_handler.py:140
|
||||
#: audits/signals_handler.py:142
|
||||
msgid "Asset permission and SystemUser"
|
||||
msgstr "资产授权与系统用户"
|
||||
|
||||
#: audits/signals_handler.py:141
|
||||
#: audits/signals_handler.py:143
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} ADD {SystemUser}"
|
||||
msgstr "{AssetPermission} 添加 {SystemUser}"
|
||||
|
||||
#: audits/signals_handler.py:142
|
||||
#: audits/signals_handler.py:144
|
||||
#, python-brace-format
|
||||
msgid "{AssetPermission} REMOVE {SystemUser}"
|
||||
msgstr "{AssetPermission} 移除 {SystemUser}"
|
||||
|
||||
#: audits/signals_handler.py:145
|
||||
#: audits/signals_handler.py:147
|
||||
msgid "User application permissions"
|
||||
msgstr "用户应用授权"
|
||||
|
||||
#: audits/signals_handler.py:146
|
||||
#: audits/signals_handler.py:148
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} ADD {User}"
|
||||
msgstr "{ApplicationPermission} 添加 {User}"
|
||||
|
||||
#: audits/signals_handler.py:147
|
||||
#: audits/signals_handler.py:149
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} REMOVE {User}"
|
||||
msgstr "{ApplicationPermission} 移除 {User}"
|
||||
|
||||
#: audits/signals_handler.py:150
|
||||
#: audits/signals_handler.py:152
|
||||
msgid "User group application permissions"
|
||||
msgstr "用户组应用授权"
|
||||
|
||||
#: audits/signals_handler.py:151
|
||||
#: audits/signals_handler.py:153
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} ADD {UserGroup}"
|
||||
msgstr "{ApplicationPermission} 添加 {UserGroup}"
|
||||
|
||||
#: audits/signals_handler.py:152
|
||||
#: audits/signals_handler.py:154
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} REMOVE {UserGroup}"
|
||||
msgstr "{ApplicationPermission} 移除 {UserGroup}"
|
||||
|
||||
#: audits/signals_handler.py:155 perms/models/application_permission.py:37
|
||||
#: audits/signals_handler.py:157 perms/models/application_permission.py:37
|
||||
msgid "Application permission"
|
||||
msgstr "应用管理"
|
||||
|
||||
#: audits/signals_handler.py:156
|
||||
#: audits/signals_handler.py:158
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} ADD {Application}"
|
||||
msgstr "{ApplicationPermission} 添加 {Application}"
|
||||
|
||||
#: audits/signals_handler.py:157
|
||||
#: audits/signals_handler.py:159
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} REMOVE {Application}"
|
||||
msgstr "{ApplicationPermission} 移除 {Application}"
|
||||
|
||||
#: audits/signals_handler.py:160
|
||||
#: audits/signals_handler.py:162
|
||||
msgid "Application permission and SystemUser"
|
||||
msgstr "应用授权与系统用户"
|
||||
|
||||
#: audits/signals_handler.py:161
|
||||
#: audits/signals_handler.py:163
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} ADD {SystemUser}"
|
||||
msgstr "{ApplicationPermission} 添加 {SystemUser}"
|
||||
|
||||
#: audits/signals_handler.py:162
|
||||
#: audits/signals_handler.py:164
|
||||
#, python-brace-format
|
||||
msgid "{ApplicationPermission} REMOVE {SystemUser}"
|
||||
msgstr "{ApplicationPermission} 移除 {SystemUser}"
|
||||
|
|
@ -6158,6 +6162,3 @@ msgstr "旗舰版"
|
|||
#: xpack/plugins/license/models.py:77
|
||||
msgid "Community edition"
|
||||
msgstr "社区版"
|
||||
|
||||
#~ msgid "Health check token"
|
||||
#~ msgstr "健康检查 Token"
|
||||
|
|
|
|||
Loading…
Reference in New Issue