diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index a9ca58dc0..0147921b6 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 e97188d9e..f1e5999e4 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: 2020-04-09 23:31+0800\n" +"POT-Creation-Date: 2020-04-13 13:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -3586,7 +3586,6 @@ msgid "Add node to this permission" msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 -#: terminal/templates/terminal/session_list.html:149 #: users/templates/users/user_detail.html:226 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:101 msgid "Join" @@ -5064,6 +5063,10 @@ msgstr "终断任务已发送,请等待" msgid "Terminate" msgstr "终断" +#: terminal/templates/terminal/session_list.html:149 +msgid "Monitoring" +msgstr "监控" + #: terminal/templates/terminal/session_list.html:179 msgid "Finish session success" msgstr "标记会话完成成功" @@ -6422,7 +6425,7 @@ msgstr "选择管理员" #: xpack/plugins/cloud/forms.py:85 msgid "Tips: The asset information is always covered" -msgstr "" +msgstr "提示:资产信息总是被覆盖" #: xpack/plugins/cloud/meta.py:9 xpack/plugins/cloud/views.py:27 #: xpack/plugins/cloud/views.py:44 xpack/plugins/cloud/views.py:62 @@ -7412,9 +7415,6 @@ msgstr "创建" #~ msgid "If set id, will use this id update user existed" #~ msgstr "如果设置了id,则会使用该行信息更新该id的用户" -#~ msgid "Monitor" -#~ msgstr "监控" - #~ msgid "Beijing Duizhan Tech, Inc." #~ msgstr "北京堆栈科技有限公司" diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html index ff25a5fbb..6876ed448 100644 --- a/apps/terminal/templates/terminal/session_list.html +++ b/apps/terminal/templates/terminal/session_list.html @@ -146,7 +146,7 @@ function initTable() { .replace("sessionID", cellData) .replace("terminalID", rowData.terminal) } - var joinBtn = ' {% trans "Join" %}'; + var joinBtn = ' {% trans "Monitoring" %}'; joinBtn = joinBtn.replace("sessionID", rowData.id); if (rowData.can_join){ joinBtn = joinBtn.replace("disabled", "") diff --git a/apps/users/utils.py b/apps/users/utils.py index 831c6571f..0729115b6 100644 --- a/apps/users/utils.py +++ b/apps/users/utils.py @@ -330,4 +330,6 @@ def get_source_choices(): choices.append((User.SOURCE_OPENID, choices_all[User.SOURCE_OPENID])) if settings.AUTH_RADIUS: choices.append((User.SOURCE_RADIUS, choices_all[User.SOURCE_RADIUS])) + if settings.AUTH_CAS: + choices.append((User.SOURCE_CAS, choices_all[User.SOURCE_CAS])) return choices