diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 3f02ced3b..5bcb3f572 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index afcb6e1cd..f0494f3de 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-26 14:56+0800\n" +"POT-Creation-Date: 2019-03-27 12:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -203,11 +203,12 @@ msgstr "名称" #: assets/templates/assets/system_user_detail.html:62 #: assets/templates/assets/system_user_list.html:30 audits/models.py:94 #: audits/templates/audits/login_log_list.html:51 authentication/forms.py:11 +#: authentication/templates/authentication/login.html:64 +#: authentication/templates/authentication/new_login.html:90 #: ops/models/adhoc.py:164 perms/templates/perms/asset_permission_list.html:74 #: perms/templates/perms/asset_permission_user.html:55 #: settings/templates/settings/_ldap_list_users_modal.html:34 users/forms.py:13 #: users/models/user.py:52 users/templates/users/_select_user_modal.html:14 -#: users/templates/users/login.html:64 users/templates/users/new_login.html:110 #: users/templates/users/user_detail.html:67 #: users/templates/users/user_list.html:24 #: users/templates/users/user_profile.html:47 @@ -228,9 +229,10 @@ msgstr "密码或密钥密码" #: assets/forms/user.py:26 assets/models/base.py:28 #: assets/serializers/asset_user.py:19 #: assets/templates/assets/_asset_user_auth_modal.html:21 -#: authentication/forms.py:13 settings/forms.py:103 users/forms.py:15 -#: users/forms.py:27 users/templates/users/login.html:67 -#: users/templates/users/new_login.html:113 +#: authentication/forms.py:13 +#: authentication/templates/authentication/login.html:67 +#: authentication/templates/authentication/new_login.html:93 +#: settings/forms.py:103 users/forms.py:15 users/forms.py:27 #: users/templates/users/reset_password.html:53 #: users/templates/users/user_create.html:10 #: users/templates/users/user_password_authentication.html:18 @@ -1024,7 +1026,7 @@ msgstr "其它" #: settings/templates/settings/command_storage_create.html:79 #: settings/templates/settings/email_setting.html:62 #: settings/templates/settings/ldap_setting.html:62 -#: settings/templates/settings/replay_storage_create.html:151 +#: settings/templates/settings/replay_storage_create.html:152 #: settings/templates/settings/security_setting.html:70 #: settings/templates/settings/terminal_setting.html:68 #: terminal/templates/terminal/terminal_update.html:45 @@ -1039,7 +1041,7 @@ msgstr "其它" #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:71 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35 -#: xpack/plugins/interface/templates/interface/interface.html:88 +#: xpack/plugins/interface/templates/interface/interface.html:72 msgid "Reset" msgstr "重置" @@ -1060,21 +1062,21 @@ msgstr "重置" #: settings/templates/settings/command_storage_create.html:80 #: settings/templates/settings/email_setting.html:63 #: settings/templates/settings/ldap_setting.html:63 -#: settings/templates/settings/replay_storage_create.html:152 +#: settings/templates/settings/replay_storage_create.html:153 #: settings/templates/settings/security_setting.html:71 #: settings/templates/settings/terminal_setting.html:70 #: terminal/templates/terminal/command_list.html:103 #: terminal/templates/terminal/session_list.html:126 #: terminal/templates/terminal/terminal_update.html:46 #: users/templates/users/_user.html:51 -#: users/templates/users/forgot_password.html:49 +#: users/templates/users/forgot_password.html:42 #: users/templates/users/user_bulk_update.html:24 #: users/templates/users/user_list.html:45 #: users/templates/users/user_password_update.html:72 #: users/templates/users/user_profile_update.html:64 #: users/templates/users/user_pubkey_update.html:77 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:72 -#: xpack/plugins/interface/templates/interface/interface.html:89 +#: xpack/plugins/interface/templates/interface/interface.html:73 msgid "Submit" msgstr "提交" @@ -2048,8 +2050,9 @@ msgstr "登录日志" msgid "Command execution log" msgstr "命令执行" -#: authentication/api/auth.py:46 users/templates/users/login.html:52 -#: users/templates/users/new_login.html:97 +#: authentication/api/auth.py:46 +#: authentication/templates/authentication/login.html:52 +#: authentication/templates/authentication/new_login.html:77 msgid "Log in frequently and try again later" msgstr "登录频繁, 稍后重试" @@ -2128,6 +2131,122 @@ msgstr "MFA 验证码" msgid "Private Token" msgstr "ssh密钥" +#: authentication/templates/authentication/login.html:27 +#: authentication/templates/authentication/login_otp.html:27 +#: users/templates/users/reset_password.html:25 +#: xpack/plugins/interface/models.py:36 +msgid "Welcome to the Jumpserver open source fortress" +msgstr "欢迎使用Jumpserver开源堡垒机" + +#: authentication/templates/authentication/login.html:29 +#: authentication/templates/authentication/login_otp.html:29 +msgid "" +"The world's first fully open source fortress, using the GNU GPL v2.0 open " +"source protocol, is a professional operation and maintenance audit system in " +"compliance with 4A." +msgstr "" +"全球首款完全开源的堡垒机，使用GNU GPL v2.0开源协议，是符合 4A 的专业运维审计" +"系统。" + +#: authentication/templates/authentication/login.html:32 +#: authentication/templates/authentication/login_otp.html:32 +msgid "" +"Developed using Python/Django, following the Web 2.0 specification and " +"equipped with industry-leading Web Terminal solutions, with beautiful " +"interactive interface and good user experience." +msgstr "" +"使用Python / Django 进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web " +"Terminal 解决方案，交互界面美观、用户体验好。" + +#: authentication/templates/authentication/login.html:35 +#: authentication/templates/authentication/login_otp.html:35 +msgid "" +"Distributed architecture is adopted to support multi-machine room deployment " +"across regions, central node provides API, and each machine room deploys " +"login node, which can be extended horizontally and without concurrent access " +"restrictions." +msgstr "" +"采纳分布式架构，支持多机房跨区域部署，中心节点提供 API，各机房部署登录节点，" +"可横向扩展、无并发访问限制。" + +#: authentication/templates/authentication/login.html:38 +#: authentication/templates/authentication/login_otp.html:38 +msgid "Changes the world, starting with a little bit." +msgstr "改变世界，从一点点开始。" + +#: authentication/templates/authentication/login.html:46 +#: authentication/templates/authentication/login.html:72 +#: authentication/templates/authentication/new_login.html:99 +#: templates/_header_bar.html:101 +msgid "Login" +msgstr "登录" + +#: authentication/templates/authentication/login.html:54 +#: authentication/templates/authentication/new_login.html:79 +msgid "The user password has expired" +msgstr "用户密码已过期" + +#: authentication/templates/authentication/login.html:57 +#: authentication/templates/authentication/new_login.html:82 +msgid "Captcha invalid" +msgstr "验证码错误" + +#: authentication/templates/authentication/login.html:83 +#: authentication/templates/authentication/new_login.html:103 +#: users/templates/users/forgot_password.html:10 +#: users/templates/users/forgot_password.html:25 +msgid "Forgot password" +msgstr "忘记密码" + +#: authentication/templates/authentication/login.html:89 +msgid "More login options" +msgstr "更多登录方式" + +#: authentication/templates/authentication/login.html:93 +msgid "Keycloak" +msgstr "" + +#: authentication/templates/authentication/login_otp.html:46 +#: users/templates/users/user_detail.html:91 +#: users/templates/users/user_profile.html:85 +msgid "MFA certification" +msgstr "MFA认证" + +#: authentication/templates/authentication/login_otp.html:51 +#: users/templates/users/user_otp_authentication.html:11 +msgid "" +"The account protection has been opened, please complete the following " +"operations according to the prompts" +msgstr "账号保护已开启，请根据提示完成以下操作" + +#: authentication/templates/authentication/login_otp.html:55 +#: users/templates/users/user_otp_authentication.html:13 +msgid "Open Authenticator and enter the 6-bit dynamic code" +msgstr "请打开手机Google Authenticator应用，输入6位动态码" + +#: authentication/templates/authentication/login_otp.html:65 +#: users/templates/users/user_otp_authentication.html:23 +#: users/templates/users/user_otp_enable_bind.html:26 +msgid "Six figures" +msgstr "6位数字" + +#: authentication/templates/authentication/login_otp.html:67 +#: users/templates/users/first_login.html:105 +#: users/templates/users/user_otp_authentication.html:26 +#: users/templates/users/user_otp_enable_bind.html:29 +#: users/templates/users/user_otp_enable_install_app.html:26 +#: users/templates/users/user_password_authentication.html:21 +msgid "Next" +msgstr "下一步" + +#: authentication/templates/authentication/login_otp.html:70 +msgid "Can't provide security? Please contact the administrator!" +msgstr "如果不能提供MFA验证码，请联系管理员!" + +#: authentication/templates/authentication/new_login.html:67 +msgid "Welcome back, please enter username and password to login" +msgstr "欢迎回来，请输入用户名和密码登录" + #: authentication/views/login.py:75 msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" @@ -3094,56 +3213,60 @@ msgstr "账户密钥" msgid "Endpoint" msgstr "端点" -#: settings/templates/settings/replay_storage_create.html:113 +#: settings/templates/settings/replay_storage_create.html:114 #, python-brace-format msgid "OSS: http://{REGION_NAME}.aliyuncs.com" msgstr "OSS: http://{REGION_NAME}.aliyuncs.com" -#: settings/templates/settings/replay_storage_create.html:115 +#: settings/templates/settings/replay_storage_create.html:116 msgid "Example: http://oss-cn-hangzhou.aliyuncs.com" msgstr "如: http://oss-cn-hangzhou.aliyuncs.com" -#: settings/templates/settings/replay_storage_create.html:117 +#: settings/templates/settings/replay_storage_create.html:118 #, python-brace-format msgid "S3: http://s3.{REGION_NAME}.amazonaws.com" msgstr "S3: http://s3.{REGION_NAME}.amazonaws.com" -#: settings/templates/settings/replay_storage_create.html:118 +#: settings/templates/settings/replay_storage_create.html:119 #, python-brace-format msgid "S3(China): http://s3.{REGION_NAME}.amazonaws.com.cn" msgstr "S3(中国): http://s3.{REGION_NAME}.amazonaws.com.cn" -#: settings/templates/settings/replay_storage_create.html:119 +#: settings/templates/settings/replay_storage_create.html:120 msgid "Example: http://s3.cn-north-1.amazonaws.com.cn" msgstr "如: http://s3.cn-north-1.amazonaws.com.cn" -#: settings/templates/settings/replay_storage_create.html:125 +#: settings/templates/settings/replay_storage_create.html:126 msgid "Endpoint suffix" msgstr "端点后缀" -#: settings/templates/settings/replay_storage_create.html:135 +#: settings/templates/settings/replay_storage_create.html:136 #: xpack/plugins/cloud/models.py:186 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 msgid "Region" msgstr "地域" -#: settings/templates/settings/replay_storage_create.html:140 +#: settings/templates/settings/replay_storage_create.html:141 msgid "Beijing: cn-north-1" msgstr "北京: cn-north-1" -#: settings/templates/settings/replay_storage_create.html:141 +#: settings/templates/settings/replay_storage_create.html:142 msgid "Ningxia: cn-northwest-1" msgstr "宁夏: cn-northwest-1" -#: settings/templates/settings/replay_storage_create.html:142 +#: settings/templates/settings/replay_storage_create.html:143 msgid "More" msgstr "更多" -#: settings/templates/settings/replay_storage_create.html:246 +#: settings/templates/settings/replay_storage_create.html:247 msgid "Submitting" msgstr "提交中" +#: settings/templates/settings/replay_storage_create.html:256 +msgid "Endpoint need contain protocol, ex: http" +msgstr "端点需要包含协议，如 http" + #: settings/templates/settings/security_setting.html:46 msgid "Password check rule" msgstr "密码校验规则" @@ -3263,11 +3386,6 @@ msgstr "用户页面" msgid "Logout" msgstr "注销登录" -#: templates/_header_bar.html:101 users/templates/users/login.html:46 -#: users/templates/users/login.html:72 users/templates/users/new_login.html:119 -msgid "Login" -msgstr "登录" - #: templates/_header_bar.html:114 templates/_nav.html:4 msgid "Dashboard" msgstr "仪表盘" @@ -3412,15 +3530,7 @@ msgstr "语言播放验证码" msgid "Captcha" msgstr "验证码" -#: templates/flash_message_standalone.html:35 -#: users/templates/users/login.html:27 users/templates/users/login_otp.html:27 -#: users/templates/users/new_login.html:82 -#: users/templates/users/reset_password.html:25 -#: xpack/plugins/interface/models.py:36 -msgid "Welcome to the Jumpserver open source fortress" -msgstr "欢迎使用Jumpserver开源堡垒机" - -#: templates/flash_message_standalone.html:56 +#: templates/flash_message_standalone.html:47 msgid "Return" msgstr "返回" @@ -3998,15 +4108,6 @@ msgstr "请选择同意条款和条件" msgid "Previous" msgstr "上一步" -#: users/templates/users/first_login.html:105 -#: users/templates/users/login_otp.html:67 -#: users/templates/users/user_otp_authentication.html:26 -#: users/templates/users/user_otp_enable_bind.html:29 -#: users/templates/users/user_otp_enable_install_app.html:26 -#: users/templates/users/user_password_authentication.html:21 -msgid "Next" -msgstr "下一步" - #: users/templates/users/first_login_done.html:31 msgid "Welcome to use jumpserver, visit " msgstr "欢迎使用Jumpserver开源跳板机系统" @@ -4019,96 +4120,10 @@ msgstr "向导" msgid " for more information" msgstr "获取更多信息" -#: users/templates/users/forgot_password.html:11 #: users/templates/users/forgot_password.html:31 -#: users/templates/users/login.html:83 users/templates/users/new_login.html:123 -msgid "Forgot password" -msgstr "忘记密码" - -#: users/templates/users/forgot_password.html:38 msgid "Input your email, that will send a mail to your" msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中" -#: users/templates/users/login.html:29 users/templates/users/login_otp.html:29 -msgid "" -"The world's first fully open source fortress, using the GNU GPL v2.0 open " -"source protocol, is a professional operation and maintenance audit system in " -"compliance with 4A." -msgstr "" -"全球首款完全开源的堡垒机，使用GNU GPL v2.0开源协议，是符合 4A 的专业运维审计" -"系统。" - -#: users/templates/users/login.html:32 users/templates/users/login_otp.html:32 -msgid "" -"Developed using Python/Django, following the Web 2.0 specification and " -"equipped with industry-leading Web Terminal solutions, with beautiful " -"interactive interface and good user experience." -msgstr "" -"使用Python / Django 进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web " -"Terminal 解决方案，交互界面美观、用户体验好。" - -#: users/templates/users/login.html:35 users/templates/users/login_otp.html:35 -msgid "" -"Distributed architecture is adopted to support multi-machine room deployment " -"across regions, central node provides API, and each machine room deploys " -"login node, which can be extended horizontally and without concurrent access " -"restrictions." -msgstr "" -"采纳分布式架构，支持多机房跨区域部署，中心节点提供 API，各机房部署登录节点，" -"可横向扩展、无并发访问限制。" - -#: users/templates/users/login.html:38 users/templates/users/login_otp.html:38 -msgid "Changes the world, starting with a little bit." -msgstr "改变世界，从一点点开始。" - -#: users/templates/users/login.html:54 users/templates/users/new_login.html:99 -msgid "The user password has expired" -msgstr "用户密码已过期" - -#: users/templates/users/login.html:57 users/templates/users/new_login.html:102 -msgid "Captcha invalid" -msgstr "验证码错误" - -#: users/templates/users/login.html:89 -msgid "More login options" -msgstr "更多登录方式" - -#: users/templates/users/login.html:93 -msgid "Keycloak" -msgstr "" - -#: users/templates/users/login_otp.html:46 -#: users/templates/users/user_detail.html:91 -#: users/templates/users/user_profile.html:85 -msgid "MFA certification" -msgstr "MFA认证" - -#: users/templates/users/login_otp.html:51 -#: users/templates/users/user_otp_authentication.html:11 -msgid "" -"The account protection has been opened, please complete the following " -"operations according to the prompts" -msgstr "账号保护已开启，请根据提示完成以下操作" - -#: users/templates/users/login_otp.html:55 -#: users/templates/users/user_otp_authentication.html:13 -msgid "Open Authenticator and enter the 6-bit dynamic code" -msgstr "请打开手机Google Authenticator应用，输入6位动态码" - -#: users/templates/users/login_otp.html:65 -#: users/templates/users/user_otp_authentication.html:23 -#: users/templates/users/user_otp_enable_bind.html:26 -msgid "Six figures" -msgstr "6位数字" - -#: users/templates/users/login_otp.html:70 -msgid "Can't provide security? Please contact the administrator!" -msgstr "如果不能提供MFA验证码，请联系管理员!" - -#: users/templates/users/new_login.html:87 -msgid "Welcome back, please enter username and password to login" -msgstr "欢迎回来，请输入用户名和密码登录" - #: users/templates/users/reset_password.html:28 msgid "" "Jumpserver is an open source desktop system developed using Python and " diff --git a/apps/settings/templates/settings/replay_storage_create.html b/apps/settings/templates/settings/replay_storage_create.html index 69a1ba9fc..c986b40e8 100644 --- a/apps/settings/templates/settings/replay_storage_create.html +++ b/apps/settings/templates/settings/replay_storage_create.html @@ -108,6 +108,7 @@
+
{% trans 'OSS: http://{REGION_NAME}.aliyuncs.com' %} @@ -251,6 +252,13 @@ $(document).ready(function() { var name = $(id_field).attr('name'); data[name] = $(id_field).val(); }); + if (data['ENDPOINT'] !== '' && data['ENDPOINT'].indexOf('http') === -1) { + var msg = "{% trans 'Endpoint need contain protocol, ex: http' %}"; + $("#endpoint_error").html(msg); + submitBtn.removeClass('disabled'); + submitBtn.html(origin_text); + return + } var url = "{% url 'api-settings:replay-storage-create' %}"; var success = function(data, textStatus) { location = "{% url 'settings:terminal-setting' %}";