From d48f8dceb500f43ff8c1d206c20faee1f1ab66a8 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 12 Jan 2018 15:55:08 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/views.py | 6 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 30048 -> 31604 bytes apps/locale/zh/LC_MESSAGES/django.po | 230 +++++++++++++++++++++------ apps/templates/_nav.html | 5 - 4 files changed, 181 insertions(+), 60 deletions(-) diff --git a/apps/common/views.py b/apps/common/views.py index ec9e54995..9a0a314ec 100644 --- a/apps/common/views.py +++ b/apps/common/views.py @@ -27,7 +27,7 @@ class BasicSettingView(AdminUserRequiredMixin, TemplateView): form.save() if "AUTH_LDAP" in form.cleaned_data: ldap_auth_enable.send(form.cleaned_data["AUTH_LDAP"]) - messages.success(request, _("Update basic setting successfully")) + messages.success(request, _("Update setting successfully")) return redirect('settings:basic-setting') else: context = self.get_context_data() @@ -52,7 +52,7 @@ class EmailSettingView(AdminUserRequiredMixin, TemplateView): form = self.form_class(request.POST) if form.is_valid(): form.save() - messages.success(request, _("Update email setting successfully")) + messages.success(request, _("Update setting successfully")) return redirect('settings:email-setting') else: context = self.get_context_data() @@ -77,7 +77,7 @@ class LDAPSettingView(AdminUserRequiredMixin, TemplateView): form = self.form_class(request.POST) if form.is_valid(): form.save() - messages.success(request, _("Update ldap setting successfully")) + messages.success(request, _("Update setting successfully")) return redirect('settings:ldap-setting') else: context = self.get_context_data() diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 5b42f9d18af67e2dc07a01530827036f620857cf..9b898fe2fa4192e3ad0847f32f3b2e9448a632c4 100644 GIT binary patch delta 12471 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 delta 11021 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 OpE-4\n" "Language-Team: Jumpserver team\n" @@ -99,16 +99,16 @@ msgstr "选择的系统用户将会在该集群资产上创建" #: assets/templates/assets/cluster_detail.html:57 #: assets/templates/assets/cluster_list.html:19 #: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:24 ops/models.py:31 -#: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34 -#: perms/models.py:14 +#: assets/templates/assets/system_user_list.html:24 common/models.py:25 +#: ops/models.py:31 ops/templates/ops/task_detail.html:56 +#: ops/templates/ops/task_list.html:34 perms/models.py:14 #: perms/templates/perms/asset_permission_create_update.html:33 #: perms/templates/perms/asset_permission_detail.html:62 #: perms/templates/perms/asset_permission_list.html:25 #: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:14 #: terminal/models.py:118 terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14 -#: users/models/user.py:36 users/templates/users/_select_user_modal.html:13 +#: users/models/user.py:35 users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_detail.html:62 #: users/templates/users/user_granted_asset.html:81 #: users/templates/users/user_group_detail.html:55 @@ -129,7 +129,8 @@ msgid "Password or private key password" msgstr "密码或秘钥不合法" #: assets/forms.py:201 assets/forms.py:262 assets/models/user.py:30 -#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:56 +#: common/forms.py:110 users/forms.py:16 users/forms.py:24 +#: users/templates/users/login.html:56 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:11 #: users/templates/users/user_password_update.html:40 @@ -138,7 +139,7 @@ msgstr "密码或秘钥不合法" msgid "Password" msgstr "密码" -#: assets/forms.py:204 assets/forms.py:264 users/models/user.py:46 +#: assets/forms.py:204 assets/forms.py:264 users/models/user.py:45 msgid "Private key" msgstr "ssh私钥" @@ -156,7 +157,7 @@ msgstr "密码和私钥, 必须输入一个" #: assets/templates/assets/system_user_detail.html:62 #: assets/templates/assets/system_user_list.html:25 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14 -#: users/models/authentication.py:44 users/models/user.py:35 +#: users/models/authentication.py:44 users/models/user.py:34 #: users/templates/users/_select_user_modal.html:14 #: users/templates/users/login.html:53 #: users/templates/users/login_log_list.html:49 @@ -376,7 +377,7 @@ msgstr "主机名原始" #: assets/templates/assets/system_user_detail.html:96 #: ops/templates/ops/adhoc_detail.html:86 perms/models.py:22 #: perms/templates/perms/asset_permission_detail.html:94 -#: users/models/user.py:51 users/templates/users/user_detail.html:98 +#: users/models/user.py:50 users/templates/users/user_detail.html:98 msgid "Created by" msgstr "创建者" @@ -399,11 +400,11 @@ msgstr "创建日期" #: assets/templates/assets/asset_group_list.html:17 #: assets/templates/assets/cluster_detail.html:97 #: assets/templates/assets/system_user_detail.html:100 -#: assets/templates/assets/system_user_list.html:30 ops/models.py:37 -#: perms/models.py:24 perms/templates/perms/asset_permission_detail.html:98 -#: terminal/models.py:22 terminal/templates/terminal/terminal_detail.html:63 -#: users/models/group.py:15 users/models/user.py:48 -#: users/templates/users/user_detail.html:110 +#: assets/templates/assets/system_user_list.html:30 common/models.py:28 +#: ops/models.py:37 perms/models.py:24 +#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:22 +#: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 +#: users/models/user.py:47 users/templates/users/user_detail.html:110 #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:14 #: users/templates/users/user_profile.html:118 @@ -419,7 +420,7 @@ msgid "Contact" msgstr "联系人" #: assets/models/cluster.py:22 assets/templates/assets/cluster_detail.html:69 -#: users/models/user.py:42 users/templates/users/user_detail.html:75 +#: users/models/user.py:41 users/templates/users/user_detail.html:75 msgid "Phone" msgstr "手机" @@ -443,7 +444,7 @@ msgstr "运营商" msgid "Default" msgstr "默认" -#: assets/models/cluster.py:36 users/models/user.py:263 +#: assets/models/cluster.py:36 users/models/user.py:258 msgid "System" msgstr "系统" @@ -508,15 +509,15 @@ msgstr "系统用户" msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" -#: assets/signals_handler.py:32 +#: assets/signals_handler.py:31 msgid "Push cluster system users to asset" msgstr "推送集群系统用户到资产" -#: assets/signals_handler.py:64 assets/signals_handler.py:126 +#: assets/signals_handler.py:63 assets/signals_handler.py:125 msgid "Push system user to cluster assets: {}->{}" msgstr "推送系统用户到: {}->{}" -#: assets/signals_handler.py:103 +#: assets/signals_handler.py:102 msgid "Push system user to assets" msgstr "推送系统用户到资产" @@ -660,6 +661,9 @@ msgstr "其它" #: assets/templates/assets/asset_group_create.html:16 #: assets/templates/assets/asset_update.html:55 #: assets/templates/assets/cluster_create_update.html:54 +#: common/templates/common/basic_setting.html:56 +#: common/templates/common/email_setting.html:56 +#: common/templates/common/ldap_setting.html:56 #: perms/templates/perms/asset_permission_create_update.html:67 #: terminal/templates/terminal/terminal_update.html:45 #: users/templates/users/_user.html:49 @@ -680,6 +684,9 @@ msgstr "重置" #: assets/templates/assets/asset_list.html:55 #: assets/templates/assets/asset_update.html:56 #: assets/templates/assets/cluster_create_update.html:55 +#: common/templates/common/basic_setting.html:57 +#: common/templates/common/email_setting.html:57 +#: common/templates/common/ldap_setting.html:57 #: perms/templates/perms/asset_permission_create_update.html:68 #: terminal/templates/terminal/terminal_update.html:46 #: users/templates/users/_user.html:50 @@ -856,7 +863,6 @@ msgstr "比例" #: assets/templates/assets/cluster_assets.html:56 #: assets/templates/assets/cluster_list.html:23 #: assets/templates/assets/system_user_list.html:31 -#: assets/templates/assets/user_asset_list.html:27 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61 #: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:41 #: perms/templates/perms/asset_permission_list.html:32 @@ -1101,7 +1107,8 @@ msgstr "选择资产" msgid "Task has been send, seen left assets status" msgstr "任务已下发，查看左侧资产状态" -#: assets/templates/assets/cluster_create_update.html:41 +#: assets/templates/assets/cluster_create_update.html:41 common/views.py:17 +#: common/views.py:44 common/views.py:69 templates/_nav.html:74 #: users/templates/users/user_profile.html:20 msgid "Settings" msgstr "设置" @@ -1199,10 +1206,6 @@ msgstr "系统用户删除失败" msgid "Connective" msgstr "连接性" -#: assets/templates/assets/user_asset_list.html:65 -msgid "Connect" -msgstr "连接" - #: assets/views/admin_user.py:30 msgid "Admin user list" msgstr "管理用户列表" @@ -1272,6 +1275,14 @@ msgstr "系统用户详情" msgid "System user asset" msgstr "系统用户集群资产" +#: common/api.py:19 +msgid "Test mail sent to {}, please check" +msgstr "邮件已经发送{}, 请检查" + +#: common/api.py:53 +msgid "Test ldap success" +msgstr "连接LDAP成功" + #: common/const.py:6 #, python-format msgid "%(name)s was created successfully" @@ -1282,6 +1293,82 @@ msgstr "%(name)s 创建成功" msgid "%(name)s was updated successfully" msgstr "%(name)s 更新成功" +#: common/forms.py:64 +msgid "Current SITE URL" +msgstr "当前站点URL" + +#: common/forms.py:68 +msgid "User Guide URL" +msgstr "用户向导URL" + +#: common/forms.py:69 +msgid "User first login update profile done redirect to it" +msgstr "用户第一次登录，修改profile后重定向到地址" + +#: common/forms.py:72 +msgid "Email Subject Prefix" +msgstr "Email主题前缀" + +#: common/forms.py:76 +msgid "Enable LDAP Auth" +msgstr "二次验证" + +#: common/forms.py:82 +msgid "SMTP host" +msgstr "SMTP主机" + +#: common/forms.py:84 +msgid "SMTP port" +msgstr "SMTP端口" + +#: common/forms.py:86 +msgid "SMTP user" +msgstr "SMTP账号" + +#: common/forms.py:89 +msgid "SMTP password" +msgstr "SMTP密码" + +#: common/forms.py:90 +msgid "Some provider use token except password" +msgstr "一些邮件提供商需要输入的是Token" + +#: common/forms.py:93 common/forms.py:130 +msgid "Use SSL" +msgstr "使用SSL" + +#: common/forms.py:94 +msgid "If SMTP port is 465, may be select" +msgstr "如果SMTP端口是465，通常需要启用SSL" + +#: common/forms.py:97 +msgid "Use TLS" +msgstr "使用TLS" + +#: common/forms.py:98 +msgid "If SMTP port is 587, may be select" +msgstr "如果SMTP端口是587，通常需要启用TLS" + +#: common/forms.py:104 +msgid "LDAP server" +msgstr "LDAP地址" + +#: common/forms.py:107 +msgid "Bind DN" +msgstr "绑定DN" + +#: common/forms.py:114 +msgid "User OU" +msgstr "用户OU" + +#: common/forms.py:117 +msgid "User search filter" +msgstr "用户过滤器" + +#: common/forms.py:120 +msgid "User attr map" +msgstr "LDAP属性映射" + #: common/mixins.py:29 msgid "is discard" msgstr "" @@ -1290,6 +1377,42 @@ msgstr "" msgid "discard time" msgstr "" +#: common/models.py:26 +msgid "Value" +msgstr "值" + +#: common/models.py:27 +msgid "Enabled" +msgstr "启用" + +#: common/templates/common/basic_setting.html:15 +#: common/templates/common/email_setting.html:15 +#: common/templates/common/ldap_setting.html:15 common/views.py:18 +msgid "Basic setting" +msgstr "基本设置" + +#: common/templates/common/basic_setting.html:18 +#: common/templates/common/email_setting.html:18 +#: common/templates/common/ldap_setting.html:18 common/views.py:45 +msgid "Email setting" +msgstr "邮件设置" + +#: common/templates/common/basic_setting.html:21 +#: common/templates/common/email_setting.html:21 +#: common/templates/common/ldap_setting.html:21 common/views.py:70 +msgid "LDAP setting" +msgstr "LDAP设置" + +#: common/templates/common/basic_setting.html:55 +#: common/templates/common/email_setting.html:55 +#: common/templates/common/ldap_setting.html:55 +msgid "Test connection" +msgstr "测试连接" + +#: common/views.py:30 common/views.py:55 common/views.py:80 +msgid "Update setting successfully" +msgstr "更新设置成功" + #: ops/models.py:32 msgid "Interval" msgstr "间隔" @@ -1570,8 +1693,8 @@ msgstr "选择用户" #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 #: terminal/templates/terminal/session_list.html:71 users/forms.py:191 -#: users/models/user.py:31 users/templates/users/user_group_detail.html:78 -#: users/views/user.py:338 +#: users/models/user.py:30 users/templates/users/user_group_detail.html:78 +#: users/views/user.py:337 msgid "User" msgstr "用户" @@ -1597,7 +1720,7 @@ msgid "" msgstr "资产 {}(组 {}) 所在集群 {} 不包含系统用户 [{}] 请检查\n" #: perms/models.py:16 perms/templates/perms/asset_permission_list.html:27 -#: templates/_nav.html:13 users/models/user.py:38 +#: templates/_nav.html:13 users/models/user.py:37 #: users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_detail.html:178 #: users/templates/users/user_list.html:26 @@ -1605,7 +1728,7 @@ msgid "User group" msgstr "用户组" #: perms/models.py:21 perms/templates/perms/asset_permission_detail.html:86 -#: users/models/user.py:50 users/templates/users/user_detail.html:94 +#: users/models/user.py:49 users/templates/users/user_detail.html:94 #: users/templates/users/user_profile.html:96 msgid "Date expired" msgstr "失效日期" @@ -1728,7 +1851,7 @@ msgstr "帮助" #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:320 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:319 msgid "Profile" msgstr "个人信息" @@ -1786,8 +1909,8 @@ msgstr "关闭" #: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44 #: users/views/group.py:62 users/views/group.py:79 users/views/login.py:194 #: users/views/login.py:243 users/views/user.py:57 users/views/user.py:72 -#: users/views/user.py:92 users/views/user.py:148 users/views/user.py:305 -#: users/views/user.py:319 users/views/user.py:356 users/views/user.py:378 +#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:304 +#: users/views/user.py:318 users/views/user.py:355 users/views/user.py:377 msgid "Users" msgstr "用户管理" @@ -1814,7 +1937,7 @@ msgstr "任务" #: terminal/views/terminal.py:31 terminal/views/terminal.py:46 #: terminal/views/terminal.py:58 msgid "Terminal" -msgstr "终端" +msgstr "终端管理" #: templates/_nav.html:51 msgid "Session online" @@ -2164,46 +2287,46 @@ msgstr "Agent" msgid "Date login" msgstr "登录日期" -#: users/models/user.py:30 users/models/user.py:259 +#: users/models/user.py:29 users/models/user.py:254 msgid "Administrator" msgstr "管理员" -#: users/models/user.py:32 +#: users/models/user.py:31 msgid "Application" msgstr "应用程序" -#: users/models/user.py:37 users/templates/users/user_detail.html:70 +#: users/models/user.py:36 users/templates/users/user_detail.html:70 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" -#: users/models/user.py:39 users/templates/users/_select_user_modal.html:15 +#: users/models/user.py:38 users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:86 #: users/templates/users/user_list.html:25 #: users/templates/users/user_profile.html:55 msgid "Role" msgstr "角色" -#: users/models/user.py:40 +#: users/models/user.py:39 msgid "Avatar" msgstr "头像" -#: users/models/user.py:41 users/templates/users/user_detail.html:81 +#: users/models/user.py:40 users/templates/users/user_detail.html:81 msgid "Wechat" msgstr "微信" -#: users/models/user.py:43 +#: users/models/user.py:42 msgid "Enable OTP" msgstr "二次验证" -#: users/models/user.py:47 users/templates/users/user_password_update.html:43 +#: users/models/user.py:46 users/templates/users/user_password_update.html:43 #: users/templates/users/user_profile.html:71 #: users/templates/users/user_profile_update.html:43 #: users/templates/users/user_pubkey_update.html:43 msgid "Public key" msgstr "ssh公钥" -#: users/models/user.py:262 +#: users/models/user.py:257 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -2316,7 +2439,7 @@ msgstr "生成重置密码连接，通过邮件发送给用户" #: users/templates/users/user_detail.html:19 #: users/templates/users/user_granted_asset.html:18 #: users/templates/users/user_group_granted_asset.html:18 -#: users/views/user.py:149 +#: users/views/user.py:148 msgid "User detail" msgstr "用户详情" @@ -2445,8 +2568,8 @@ msgstr "用户删除失败" msgid "OTP" msgstr "" -#: users/templates/users/user_profile.html:100 users/views/user.py:178 -#: users/views/user.py:230 +#: users/templates/users/user_profile.html:100 users/views/user.py:177 +#: users/views/user.py:229 msgid "User groups" msgstr "用户组" @@ -2470,7 +2593,7 @@ msgstr "指纹" msgid "Update public key" msgstr "更新密钥" -#: users/templates/users/user_update.html:4 users/views/user.py:92 +#: users/templates/users/user_update.html:4 users/views/user.py:91 msgid "Update user" msgstr "编辑用户" @@ -2665,26 +2788,29 @@ msgstr "登录日志" msgid "User list" msgstr "用户列表" -#: users/views/user.py:102 +#: users/views/user.py:101 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:207 +#: users/views/user.py:206 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:306 +#: users/views/user.py:305 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:339 +#: users/views/user.py:338 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:357 +#: users/views/user.py:356 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:379 +#: users/views/user.py:378 msgid "Public key update" msgstr "秘钥更新" + +#~ msgid "Connect" +#~ msgstr "连接" diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html index 1493e55dc..eec72cf04 100644 --- a/apps/templates/_nav.html +++ b/apps/templates/_nav.html @@ -51,11 +51,6 @@
  • {% trans 'Session online' %}
  • {% trans 'Session offline' %}
  • {% trans 'Command' %}
    • -
  • - - {% trans 'Web terminal' %} - -