From bf922459ff71c6cfe60fa55cbb14668eac3e88ae Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Mon, 6 Jan 2020 11:43:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=EF=BC=9BOpen=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=BA=94=E7=94=A8=EF=BC=9B=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=B5=84=E4=BA=A7/=E7=B3=BB=E7=BB=9F=E7=94=A8?= =?UTF-8?q?=E6=88=B7/=E7=BB=84=E7=BB=87=E7=AD=89=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=9B=20(#3594)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 修改创建按钮样式 * [Update] Open数据库应用 * [Update] 取消资产/系统用户/组织等名称对于特殊字符的限制 --- .../applications/database_app_list.html | 5 +- .../applications/remote_app_list.html | 5 +- apps/assets/const.py | 12 - apps/assets/forms/asset.py | 2 - apps/assets/forms/user.py | 2 - apps/assets/serializers/asset.py | 13 - apps/assets/serializers/system_user.py | 13 - apps/locale/zh/LC_MESSAGES/django.mo | Bin 84172 -> 83858 bytes apps/locale/zh/LC_MESSAGES/django.po | 282 +++++++++--------- apps/locale/zh/LC_MESSAGES/djangojs.mo | Bin 2782 -> 2741 bytes apps/orgs/serializers.py | 13 - apps/templates/_nav.html | 6 +- apps/templates/_nav_user.html | 4 +- .../templates/terminal/base_storage_list.html | 5 +- 14 files changed, 148 insertions(+), 214 deletions(-) diff --git a/apps/applications/templates/applications/database_app_list.html b/apps/applications/templates/applications/database_app_list.html index 5b60467b1..74a5c907e 100644 --- a/apps/applications/templates/applications/database_app_list.html +++ b/apps/applications/templates/applications/database_app_list.html @@ -5,10 +5,9 @@ {% block table_search %}{% endblock %} {% block table_container %}
AbEtvuo6m3w@oUrs^M|^vT!$L?N7RISQMcj<
zYMkp<{|dE`x2SRBF{yS`llyeVX(^<|+^Bn73DaOh)RxAg2Iy@LF~^!y%z3C=v>Y|g
zcUT Pi-yYfuwxMvb!%^?l$xYQl%8
zo%W`>aYInQ_IW8N b`N^0tB#qS~H2hjEf<#r@}v|S*kr{XF7?vd9u
z!p3ci`z>~jydM8T3ChudLO$EkH#De3c^u_2YQzM;ko3baC*@qEpGeQ*e)}lUT}taN
z)>BjI>PD?TRd>?sFX}T>K0}_r(Dr?4*p64I|Bjfhu9WwYf9Mr`e>UdN7sN*3Rr>3}
z9zwZ`^@$|bF(GFc%jB&YAOq=3f~hEHrSTogi8TO;?{`ibTuy37{vx&|?IEu#m^>e_
zPF34TF5JLad@J((lez+!k2b4FU(kLjDL-wBB;-9GOR$X%G@AT#IyR&-9qA?ce@MD^
zQ}^NOMcv<&@6)dv!GEp)Bii<+{0a5?F~N5O-_?w^`a$?P rQ%sB`>#H@Sac_dx>(MnuPI
ztmugDvAz05$HXTd7hEf#Pp`hcV(FXr$cr=~t%}wf7!j`8qP4?gBPs@!Dp9gR(UPT#
zmM#%gvQ))VWeb-mU!p{Ori&$0XT3db!tGfbZta}@$EpptCye=H^Uk}A$KT$x;O@rw
z+IPmLTF^J6U*@EL?OtrFIQ;B+f)uxReRF%}>_7G`yE9{T{H}jKsh0H4f))1`&AL7L
Mn;j*~`Gu$XfB$#A_W%F@
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 6f4adc328..19aa56f8c 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-12-30 12:26+0800\n"
+"POT-Creation-Date: 2020-01-06 11:35+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler m=wFBUe`gG7$>2wXg+FTt5C1wChUUSFe_#`
zINX8Vsy)c5*moD3TL9##7|`?@y%f9~d=g*ihQ
ztT^Xyl&dgMFatc}T*RrP8g<*qSHKv~l9V5jzlVbvdl+W}+D^o#
k{FV938osfLboadmxy&M{juoujz{+jRNOQ2&Pc-Aq6{rPm
zGQT#zyU+Qn;vfO->=W5Oll)^+NAj~Q?rx$`kiu&^CngP`+?@2`>c~LD
zNrBY8wBSM7r?Gqm^8KjGOwv_?G>3di`ZS>K0qIL(pOVTD``y~Tq0Hqv;a
\n"
" Don't close this page"
@@ -2869,15 +2859,15 @@ msgstr ""
"等待 {} 确认, 你也可以复制链接发给他/她
\n"
" 不要关闭本页面"
-#: authentication/views/login.py:163
+#: authentication/views/login.py:164
msgid "No ticket found"
msgstr "没有发现工单"
-#: authentication/views/login.py:186
+#: authentication/views/login.py:187
msgid "Logout success"
msgstr "退出登录成功"
-#: authentication/views/login.py:187
+#: authentication/views/login.py:188
msgid "Logout success, return login page"
msgstr "退出登录成功,返回到登录页面"
@@ -3326,7 +3316,7 @@ msgstr ""
msgid "Ops"
msgstr "作业中心"
-#: ops/views/adhoc.py:32 templates/_nav.html:122
+#: ops/views/adhoc.py:32 templates/_nav.html:124
#: xpack/plugins/gathered_user/views.py:35
msgid "Task list"
msgstr "任务列表"
@@ -3410,7 +3400,7 @@ msgstr "上传下载"
msgid "Actions"
msgstr "动作"
-#: perms/models/asset_permission.py:87 templates/_nav.html:76
+#: perms/models/asset_permission.py:87 templates/_nav.html:78
#: tickets/templates/tickets/ticket_list.html:22
#: users/templates/users/_user_detail_nav_header.html:31
#: users/views/user.py:221
@@ -3507,7 +3497,6 @@ msgstr "有效期"
#: perms/templates/perms/asset_permission_detail.html:61
#: perms/templates/perms/database_app_permission_detail.html:61
#: perms/templates/perms/remote_app_permission_detail.html:61
-#: xpack/plugins/license/templates/license/license_detail.html:67
msgid "User count"
msgstr "用户数量"
@@ -3657,7 +3646,7 @@ msgstr "添加用户组"
#: perms/views/remote_app_permission.py:66
#: perms/views/remote_app_permission.py:84
#: perms/views/remote_app_permission.py:116
-#: perms/views/remote_app_permission.py:149 templates/_nav.html:73
+#: perms/views/remote_app_permission.py:149 templates/_nav.html:75
#: xpack/plugins/orgs/templates/orgs/org_list.html:22
msgid "Perms"
msgstr "权限管理"
@@ -4094,7 +4083,7 @@ msgstr "当前无勾选用户,请勾选你想要导入的用户"
#: settings/templates/settings/_ldap_list_users_modal.html:172
#: templates/_csv_import_export.html:13 templates/_csv_import_modal.html:5
-#: xpack/plugins/license/templates/license/license_detail.html:101
+#: xpack/plugins/license/templates/license/license_detail.html:88
msgid "Import"
msgstr "导入"
@@ -4150,7 +4139,7 @@ msgstr "这里"
#: settings/views.py:19 settings/views.py:46 settings/views.py:73
#: settings/views.py:105 settings/views.py:134 settings/views.py:161
-#: templates/_nav.html:185
+#: templates/_nav.html:187
msgid "Settings"
msgstr "系统设置"
@@ -4187,7 +4176,7 @@ msgstr "下载更新模版"
msgid "Help"
msgstr "帮助"
-#: templates/_header_bar.html:19 templates/_without_nav_base.html:27
+#: templates/_header_bar.html:19 templates/_without_nav_base.html:28
msgid "Docs"
msgstr "文档"
@@ -4203,7 +4192,7 @@ msgstr "商业支持"
#: users/templates/users/user_profile.html:17
#: users/templates/users/user_profile_update.html:37
#: users/templates/users/user_profile_update.html:61
-#: users/templates/users/user_pubkey_update.html:37 users/views/profile.py:49
+#: users/templates/users/user_pubkey_update.html:37 users/views/profile.py:51
msgid "Profile"
msgstr "个人信息"
@@ -4298,8 +4287,8 @@ msgstr ""
#: templates/_nav.html:17 users/views/group.py:28 users/views/group.py:45
#: users/views/group.py:63 users/views/group.py:82 users/views/group.py:99
-#: users/views/login.py:158 users/views/profile.py:88
-#: users/views/profile.py:123 users/views/user.py:50 users/views/user.py:67
+#: users/views/login.py:158 users/views/profile.py:90
+#: users/views/profile.py:125 users/views/user.py:50 users/views/user.py:67
#: users/views/user.py:111 users/views/user.py:178 users/views/user.py:206
#: users/views/user.py:220 users/views/user.py:234 users/views/user.py:248
#: users/views/user.py:262 users/views/user.py:276
@@ -4314,69 +4303,69 @@ msgstr "用户列表"
msgid "Command filters"
msgstr "命令过滤"
-#: templates/_nav.html:95 terminal/views/command.py:21
+#: templates/_nav.html:97 terminal/views/command.py:21
#: terminal/views/session.py:43 terminal/views/session.py:54
#: terminal/views/session.py:78 terminal/views/terminal.py:32
#: terminal/views/terminal.py:48 terminal/views/terminal.py:61
msgid "Sessions"
msgstr "会话管理"
-#: templates/_nav.html:98
+#: templates/_nav.html:100
msgid "Session online"
msgstr "在线会话"
-#: templates/_nav.html:99 terminal/views/session.py:55
+#: templates/_nav.html:101 terminal/views/session.py:55
msgid "Session offline"
msgstr "历史会话"
-#: templates/_nav.html:100
+#: templates/_nav.html:102
msgid "Commands"
msgstr "命令记录"
-#: templates/_nav.html:103 templates/_nav_user.html:42
+#: templates/_nav.html:105 templates/_nav_user.html:42
msgid "Web terminal"
msgstr "Web终端"
-#: templates/_nav.html:104 templates/_nav_user.html:47
+#: templates/_nav.html:106 templates/_nav_user.html:47
msgid "File manager"
msgstr "文件管理"
-#: templates/_nav.html:108 terminal/views/storage.py:27
+#: templates/_nav.html:110 terminal/views/storage.py:27
#: terminal/views/storage.py:42 terminal/views/storage.py:96
#: terminal/views/storage.py:120 terminal/views/storage.py:149
#: terminal/views/storage.py:175
msgid "Terminal"
msgstr "终端管理"
-#: templates/_nav.html:119
+#: templates/_nav.html:121
msgid "Job Center"
msgstr "作业中心"
-#: templates/_nav.html:123 templates/_nav.html:151
+#: templates/_nav.html:125 templates/_nav.html:153
msgid "Batch command"
msgstr "批量命令"
-#: templates/_nav.html:125
+#: templates/_nav.html:127
msgid "Task monitor"
msgstr "任务监控"
-#: templates/_nav.html:135 tickets/views.py:19 tickets/views.py:37
+#: templates/_nav.html:137 tickets/views.py:19 tickets/views.py:37
msgid "Tickets"
msgstr "工单管理"
-#: templates/_nav.html:161
+#: templates/_nav.html:163
msgid "XPack"
msgstr ""
-#: templates/_nav.html:169 xpack/plugins/cloud/views.py:28
+#: templates/_nav.html:171 xpack/plugins/cloud/views.py:28
msgid "Account list"
msgstr "账户列表"
-#: templates/_nav.html:170
+#: templates/_nav.html:172
msgid "Sync instance"
msgstr "同步实例"
-#: templates/_nav_user.html:11
+#: templates/_nav_user.html:10
msgid "My Applications"
msgstr "我的应用"
@@ -4385,7 +4374,7 @@ msgid ""
"Displays the results of items _START_ to _END_; A total of _TOTAL_ entries"
msgstr "显示第 _START_ 至 _END_ 项结果; 总共 _TOTAL_ 项"
-#: templates/_without_nav_base.html:25
+#: templates/_without_nav_base.html:26
msgid "Home page"
msgstr "首页"
@@ -5037,7 +5026,7 @@ msgid "Could not reset self otp, use profile reset instead"
msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
#: users/forms/group.py:19 users/forms/user.py:143 users/forms/user.py:148
-#: xpack/plugins/orgs/forms.py:18
+#: xpack/plugins/orgs/forms.py:17
msgid "Select users"
msgstr "选择用户"
@@ -5138,7 +5127,7 @@ msgstr "复制用户公钥到这里"
msgid "Join user groups"
msgstr "添加到用户组"
-#: users/forms/user.py:103 users/views/login.py:119 users/views/profile.py:105
+#: users/forms/user.py:103 users/views/login.py:119 users/views/profile.py:107
msgid "* Your password does not meet the requirements"
msgstr "* 您的密码不符合要求"
@@ -5162,7 +5151,7 @@ msgstr "密码策略"
msgid "Administrator"
msgstr "管理员"
-#: users/models/user.py:145 xpack/plugins/orgs/forms.py:30
+#: users/models/user.py:145 xpack/plugins/orgs/forms.py:29
#: xpack/plugins/orgs/templates/orgs/org_list.html:14
msgid "Auditor"
msgstr "审计员"
@@ -5595,7 +5584,7 @@ msgstr "Android手机下载"
msgid "iPhone downloads"
msgstr "iPhone手机下载"
-#: users/templates/users/user_otp_enable_install_app.html:23
+#: users/templates/users/user_otp_enable_install_app.html:22
msgid ""
"After installation, click the next step to enter the binding page (if "
"installed, go to the next step directly)."
@@ -5899,35 +5888,35 @@ msgstr "Token错误或失效"
msgid "First login"
msgstr "首次登录"
-#: users/views/profile.py:69
+#: users/views/profile.py:71
msgid "Profile setting"
msgstr "个人信息设置"
-#: users/views/profile.py:89
+#: users/views/profile.py:91
msgid "Password update"
msgstr "密码更新"
-#: users/views/profile.py:124
+#: users/views/profile.py:126
msgid "Public key update"
msgstr "密钥更新"
-#: users/views/profile.py:152
+#: users/views/profile.py:154
msgid "Password invalid"
msgstr "用户名或密码无效"
-#: users/views/profile.py:256
+#: users/views/profile.py:265
msgid "MFA enable success"
msgstr "MFA 绑定成功"
-#: users/views/profile.py:257
+#: users/views/profile.py:266
msgid "MFA enable success, return login page"
msgstr "MFA 绑定成功,返回到登录页面"
-#: users/views/profile.py:259
+#: users/views/profile.py:268
msgid "MFA disable success"
msgstr "MFA 解绑成功"
-#: users/views/profile.py:260
+#: users/views/profile.py:269
msgid "MFA disable success, return login page"
msgstr "MFA 解绑成功,返回登录页面"
@@ -6191,7 +6180,7 @@ msgstr "选择实例"
msgid "Select node"
msgstr "选择节点"
-#: xpack/plugins/cloud/forms.py:82 xpack/plugins/orgs/forms.py:21
+#: xpack/plugins/cloud/forms.py:82 xpack/plugins/orgs/forms.py:20
msgid "Select admins"
msgstr "选择管理员"
@@ -6540,8 +6529,14 @@ msgstr "标准版"
msgid "Enterprise edition"
msgstr "企业版"
+#: xpack/plugins/license/models.py:78
+#, fuzzy
+#| msgid "Enterprise edition"
+msgid "Ultimate edition"
+msgstr "企业版"
+
#: xpack/plugins/license/templates/license/_license_import_modal.html:4
-#: xpack/plugins/license/templates/license/license_detail.html:99
+#: xpack/plugins/license/templates/license/license_detail.html:86
msgid "Import license"
msgstr "导入许可证"
@@ -6587,26 +6582,15 @@ msgstr "公司"
msgid "Expired"
msgstr "过期时间"
-#: xpack/plugins/license/templates/license/license_detail.html:64
-#: xpack/plugins/license/templates/license/license_detail.html:68
-#: xpack/plugins/license/templates/license/license_detail.html:72
-#: xpack/plugins/license/templates/license/license_detail.html:76
-msgid "Unlimited"
-msgstr "无限制"
-
-#: xpack/plugins/license/templates/license/license_detail.html:75
-msgid "Concurrent connections"
-msgstr "并发连接"
-
-#: xpack/plugins/license/templates/license/license_detail.html:80
+#: xpack/plugins/license/templates/license/license_detail.html:67
msgid "Edition"
msgstr "版本"
-#: xpack/plugins/license/templates/license/license_detail.html:106
+#: xpack/plugins/license/templates/license/license_detail.html:93
msgid "Technology consulting"
msgstr "技术咨询"
-#: xpack/plugins/license/templates/license/license_detail.html:109
+#: xpack/plugins/license/templates/license/license_detail.html:96
msgid "Consult"
msgstr "咨询"
@@ -6618,11 +6602,11 @@ msgstr "许可证导入成功"
msgid "License is invalid"
msgstr "无效的许可证"
-#: xpack/plugins/orgs/forms.py:24
+#: xpack/plugins/orgs/forms.py:23
msgid "Select auditor"
msgstr "选择审计员"
-#: xpack/plugins/orgs/forms.py:29
+#: xpack/plugins/orgs/forms.py:28
#: xpack/plugins/orgs/templates/orgs/org_detail.html:71
#: xpack/plugins/orgs/templates/orgs/org_list.html:13
msgid "Admin"
@@ -6682,6 +6666,12 @@ msgstr "密码匣子"
msgid "vault create"
msgstr "创建"
+#~ msgid "Unlimited"
+#~ msgstr "无限制"
+
+#~ msgid "Concurrent connections"
+#~ msgstr "并发连接"
+
#~ msgid "Update assets"
#~ msgstr "更新资产"
diff --git a/apps/locale/zh/LC_MESSAGES/djangojs.mo b/apps/locale/zh/LC_MESSAGES/djangojs.mo
index 4bd390695a945e5f13744670c777354e7d85cc70..24e68caf523648ed333a85c565401a6fbac6a37e 100644
GIT binary patch
delta 273
zcmXZWKMnyw6oB!!OV;kjzlh1o5`~h4LM73PBe(!}(Cr1pDRc^Aqfprch)$u=XjN*3
zZ+O*j^1hkOdzhoyx11z$L{^?iQ$#iekve8L#2b<%@c&lT2#d_yIKm!IaG`yx{h*%J
z3kKY~V*{VQB)`K)2Zm}xA1gRT`_T+zoMRai?BW{jf+s9thIa8Q*3b?A?~U3~2e_n<
N!!&kx`Sk6*a$nFs8a@C3
delta 312
zcmXZWzY76j7zgm@kRO*HB}y1940QG0p`77T$Y8x
+ {% if LICENSE_VALID %}