From b4080be5beda3324314ddaebc99ecd363d53f88e Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 10 Jan 2018 00:38:21 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/templates/assets/cluster_list.html | 2 +- apps/assets/views/cluster.py | 2 +- apps/jumpserver/urls.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 30126 -> 29961 bytes apps/locale/zh/LC_MESSAGES/django.po | 153 +++++++++--------- 5 files changed, 77 insertions(+), 82 deletions(-) diff --git a/apps/assets/templates/assets/cluster_list.html b/apps/assets/templates/assets/cluster_list.html index b6c0abfb2..e4743b346 100644 --- a/apps/assets/templates/assets/cluster_list.html +++ b/apps/assets/templates/assets/cluster_list.html @@ -8,7 +8,7 @@ {% block table_search %}{% endblock %} {% block table_container %}
- {% trans "Create Cluster" %} + {% trans "Create cluster" %}
diff --git a/apps/assets/views/cluster.py b/apps/assets/views/cluster.py index 567e881dd..e1a2f6fba 100644 --- a/apps/assets/views/cluster.py +++ b/apps/assets/views/cluster.py @@ -40,7 +40,7 @@ class ClusterCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView) def get_context_data(self, **kwargs): context = { 'app': _('assets'), - 'action': _('Create Cluster'), + 'action': _('Create cluster'), } kwargs.update(context) return super().get_context_data(**kwargs) diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index 21d42d0dd..839492e7a 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -36,6 +36,6 @@ urlpatterns = [ if settings.DEBUG: urlpatterns += [ url(r'^docs/', schema_view, name="docs"), - ] + static(settings.STATIC_URL, document_root=settings.STATIC_DIR) \ + ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 5bb422501d5c1e84b09d0fafbf0347cc7c371e46..0e2eafee39d6a5ed51982f7abeab6202ca62870f 100644 GIT binary patch delta 10755 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index b34a774f4..a997277e8 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: 2018-01-09 23:01+0800\n" +"POT-Creation-Date: 2018-01-10 00:30+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -48,7 +48,7 @@ msgstr "默认使用管理用户" msgid "Select assets" msgstr "选择资产" -#: assets/forms.py:86 assets/models/asset.py:45 +#: assets/forms.py:86 assets/models/asset.py:55 #: assets/templates/assets/admin_user_assets.html:61 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/asset_group_detail.html:47 @@ -60,7 +60,7 @@ msgstr "选择资产" msgid "Port" msgstr "端口" -#: assets/forms.py:124 assets/models/asset.py:161 +#: assets/forms.py:124 assets/models/asset.py:171 #: assets/templates/assets/admin_user_list.html:24 #: assets/templates/assets/asset_group_list.html:16 #: assets/templates/assets/system_user_list.html:26 perms/models.py:17 @@ -91,7 +91,7 @@ msgstr "系统用户" msgid "Selected system users will be create at cluster assets" msgstr "选择的系统用户将会在该集群资产上创建" -#: assets/forms.py:173 assets/forms.py:248 assets/forms.py:307 +#: assets/forms.py:173 assets/forms.py:248 assets/forms.py:308 #: assets/models/cluster.py:18 assets/models/group.py:20 #: assets/models/user.py:28 assets/templates/assets/admin_user_detail.html:56 #: assets/templates/assets/admin_user_list.html:22 @@ -128,8 +128,8 @@ msgstr "集群级别管理用户" msgid "Password or private key password" msgstr "密码或秘钥不合法" -#: assets/forms.py:201 assets/models/user.py:30 users/forms.py:16 -#: users/forms.py:24 users/templates/users/login.html:56 +#: 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 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:11 #: users/templates/users/user_password_update.html:40 @@ -138,11 +138,11 @@ msgstr "密码或秘钥不合法" msgid "Password" msgstr "密码" -#: assets/forms.py:204 users/models/user.py:46 +#: assets/forms.py:204 assets/forms.py:264 users/models/user.py:46 msgid "Private key" msgstr "ssh私钥" -#: assets/forms.py:229 assets/forms.py:289 assets/forms.py:350 +#: assets/forms.py:229 assets/forms.py:290 assets/forms.py:354 msgid "Invalid private key" msgstr "ssh密钥不合法" @@ -150,7 +150,7 @@ msgstr "ssh密钥不合法" msgid "Password and private key file must be input one" msgstr "密码和私钥, 必须输入一个" -#: assets/forms.py:249 assets/forms.py:308 assets/models/user.py:29 +#: assets/forms.py:249 assets/forms.py:309 assets/models/user.py:29 #: assets/templates/assets/admin_user_detail.html:60 #: assets/templates/assets/admin_user_list.html:23 #: assets/templates/assets/system_user_detail.html:57 @@ -166,73 +166,73 @@ msgstr "密码和私钥, 必须输入一个" msgid "Username" msgstr "用户名" -#: assets/forms.py:296 assets/forms.py:356 +#: assets/forms.py:297 assets/forms.py:360 msgid "Auth info required, private_key or password" msgstr "密钥和密码必须填写一个" -#: assets/forms.py:311 +#: assets/forms.py:313 msgid " Select clusters" msgstr "选择集群" -#: assets/forms.py:316 +#: assets/forms.py:320 msgid "If auto push checked, system user will be create at cluster assets" msgstr "如果选择了自动推送，系统用户将会创建在集群资产上" -#: assets/forms.py:317 +#: assets/forms.py:321 msgid "Auto push system user to asset" msgstr "自动推送系统用户到资产" -#: assets/forms.py:318 +#: assets/forms.py:322 msgid "" "High level will be using login asset as default, if user was granted more " "than 2 system user" msgstr "高优先级的系统用户将会作为默认登录用户" -#: assets/models/asset.py:24 +#: assets/models/asset.py:34 msgid "In use" msgstr "使用中" -#: assets/models/asset.py:25 +#: assets/models/asset.py:35 msgid "Out of use" msgstr "未使用" -#: assets/models/asset.py:28 +#: assets/models/asset.py:38 msgid "Server" msgstr "物理机" -#: assets/models/asset.py:29 +#: assets/models/asset.py:39 msgid "VM" msgstr "虚拟机" -#: assets/models/asset.py:30 +#: assets/models/asset.py:40 msgid "Switch" msgstr "交换机" -#: assets/models/asset.py:31 +#: assets/models/asset.py:41 msgid "Router" msgstr "路由器" -#: assets/models/asset.py:32 +#: assets/models/asset.py:42 msgid "Firewall" msgstr "防火墙" -#: assets/models/asset.py:33 +#: assets/models/asset.py:43 msgid "Storage" msgstr "存储" -#: assets/models/asset.py:36 +#: assets/models/asset.py:46 msgid "Production" msgstr "生产环境" -#: assets/models/asset.py:37 +#: assets/models/asset.py:47 msgid "Development" msgstr "开发环境" -#: assets/models/asset.py:38 +#: assets/models/asset.py:48 msgid "Testing" msgstr "测试环境" -#: assets/models/asset.py:43 assets/templates/assets/admin_user_assets.html:60 +#: assets/models/asset.py:53 assets/templates/assets/admin_user_assets.html:60 #: assets/templates/assets/asset_detail.html:61 #: assets/templates/assets/asset_group_detail.html:46 #: assets/templates/assets/asset_list.html:31 @@ -246,7 +246,7 @@ msgstr "测试环境" msgid "IP" msgstr "IP" -#: assets/models/asset.py:44 assets/templates/assets/admin_user_assets.html:59 +#: assets/models/asset.py:54 assets/templates/assets/admin_user_assets.html:59 #: assets/templates/assets/asset_detail.html:57 #: assets/templates/assets/asset_group_detail.html:45 #: assets/templates/assets/asset_list.html:30 @@ -259,116 +259,116 @@ msgstr "IP" msgid "Hostname" msgstr "主机名" -#: assets/models/asset.py:46 assets/templates/assets/asset_detail.html:213 +#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:213 #: assets/views/asset.py:218 assets/views/asset.py:258 msgid "Asset groups" msgstr "资产组" -#: assets/models/asset.py:47 assets/models/cluster.py:40 +#: assets/models/asset.py:57 assets/models/cluster.py:40 #: assets/models/user.py:219 assets/templates/assets/asset_detail.html:85 #: assets/templates/assets/asset_list.html:33 templates/_nav.html:24 msgid "Cluster" msgstr "集群" -#: assets/models/asset.py:48 assets/templates/assets/asset_detail.html:129 +#: assets/models/asset.py:58 assets/templates/assets/asset_detail.html:129 msgid "Is active" msgstr "激活" -#: assets/models/asset.py:49 assets/templates/assets/asset_detail.html:133 +#: assets/models/asset.py:59 assets/templates/assets/asset_detail.html:133 msgid "Asset type" msgstr "系统类型" -#: assets/models/asset.py:50 assets/templates/assets/asset_detail.html:137 +#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:137 msgid "Asset environment" msgstr "资产环境" -#: assets/models/asset.py:51 assets/templates/assets/asset_detail.html:125 +#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:125 msgid "Asset status" msgstr "资产状态" -#: assets/models/asset.py:54 assets/models/cluster.py:19 +#: assets/models/asset.py:64 assets/models/cluster.py:19 #: assets/models/user.py:190 assets/templates/assets/asset_detail.html:73 #: assets/templates/assets/cluster_list.html:20 templates/_nav.html:25 msgid "Admin user" msgstr "管理用户" -#: assets/models/asset.py:57 assets/templates/assets/asset_detail.html:65 +#: assets/models/asset.py:67 assets/templates/assets/asset_detail.html:65 msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:58 +#: assets/models/asset.py:68 msgid "Remote control card IP" msgstr "远控卡IP" -#: assets/models/asset.py:59 assets/templates/assets/asset_detail.html:89 +#: assets/models/asset.py:69 assets/templates/assets/asset_detail.html:89 msgid "Cabinet number" msgstr "机柜编号" -#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:93 +#: assets/models/asset.py:70 assets/templates/assets/asset_detail.html:93 msgid "Cabinet position" msgstr "机柜层号" -#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:145 +#: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:145 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:64 assets/templates/assets/asset_detail.html:97 +#: assets/models/asset.py:74 assets/templates/assets/asset_detail.html:97 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:101 +#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:101 msgid "Model" msgstr "型号" -#: assets/models/asset.py:66 assets/templates/assets/asset_detail.html:141 +#: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:141 msgid "Serial number" msgstr "序列号" -#: assets/models/asset.py:68 +#: assets/models/asset.py:78 msgid "CPU model" msgstr "CPU型号" -#: assets/models/asset.py:69 +#: assets/models/asset.py:79 msgid "CPU count" msgstr "CPU数量" -#: assets/models/asset.py:70 +#: assets/models/asset.py:80 msgid "CPU cores" msgstr "CPU核数" -#: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:109 +#: assets/models/asset.py:81 assets/templates/assets/asset_detail.html:109 msgid "Memory" msgstr "内存" -#: assets/models/asset.py:72 +#: assets/models/asset.py:82 msgid "Disk total" msgstr "硬盘大小" -#: assets/models/asset.py:73 +#: assets/models/asset.py:83 msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:117 +#: assets/models/asset.py:85 assets/templates/assets/asset_detail.html:117 msgid "Platform" msgstr "系统平台" -#: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:121 +#: assets/models/asset.py:86 assets/templates/assets/asset_detail.html:121 msgid "OS" msgstr "操作系统" -#: assets/models/asset.py:77 +#: assets/models/asset.py:87 msgid "OS version" msgstr "系统版本" -#: assets/models/asset.py:78 +#: assets/models/asset.py:88 msgid "OS arch" msgstr "系统架构" -#: assets/models/asset.py:79 +#: assets/models/asset.py:89 msgid "Hostname raw" msgstr "主机名原始" -#: assets/models/asset.py:81 assets/models/cluster.py:28 +#: assets/models/asset.py:91 assets/models/cluster.py:28 #: assets/models/group.py:21 assets/models/user.py:36 #: assets/templates/assets/admin_user_detail.html:68 #: assets/templates/assets/asset_detail.html:149 @@ -380,7 +380,7 @@ msgstr "主机名原始" msgid "Created by" msgstr "创建者" -#: assets/models/asset.py:82 assets/models/cluster.py:26 +#: assets/models/asset.py:92 assets/models/cluster.py:26 #: assets/models/group.py:22 assets/templates/assets/admin_user_detail.html:64 #: assets/templates/assets/cluster_detail.html:89 #: assets/templates/assets/system_user_detail.html:87 @@ -391,7 +391,7 @@ msgstr "创建者" msgid "Date created" msgstr "创建日期" -#: assets/models/asset.py:83 assets/models/cluster.py:29 +#: assets/models/asset.py:93 assets/models/cluster.py:29 #: assets/models/group.py:23 assets/models/user.py:33 #: assets/templates/assets/admin_user_detail.html:72 #: assets/templates/assets/admin_user_list.html:28 @@ -578,8 +578,8 @@ msgstr "仅修改你需要更新的字段" #: assets/views/cluster.py:26 assets/views/cluster.py:85 #: assets/views/cluster.py:102 assets/views/group.py:34 #: assets/views/group.py:52 assets/views/group.py:69 assets/views/group.py:87 -#: assets/views/system_user.py:30 assets/views/system_user.py:46 -#: assets/views/system_user.py:62 assets/views/system_user.py:77 +#: assets/views/system_user.py:28 assets/views/system_user.py:44 +#: assets/views/system_user.py:60 assets/views/system_user.py:75 #: templates/_nav.html:19 msgid "Assets" msgstr "资产管理" @@ -620,7 +620,7 @@ msgstr "如果设置了id，则会使用该行信息更新该id的资产" #: assets/templates/assets/_system_user.html:16 #: assets/templates/assets/system_user_list.html:16 -#: assets/views/system_user.py:47 +#: assets/views/system_user.py:45 msgid "Create system user" msgstr "创建系统用户" @@ -1104,10 +1104,6 @@ msgstr "任务已下发，查看左侧资产状态" msgid "Settings" msgstr "设置" -#: assets/templates/assets/cluster_list.html:11 assets/views/cluster.py:43 -msgid "Create Cluster" -msgstr "创建Cluster" - #: assets/templates/assets/cluster_list.html:21 #: users/templates/users/_select_user_modal.html:17 msgid "Asset num" @@ -1234,10 +1230,14 @@ msgid "Cluster list" msgstr "集群列表" #: assets/views/cluster.py:42 assets/views/cluster.py:70 -#: assets/views/system_user.py:98 +#: assets/views/system_user.py:96 msgid "assets" msgstr "资产管理" +#: assets/views/cluster.py:43 +msgid "Create cluster" +msgstr "创建集群" + #: assets/views/cluster.py:71 msgid "Update Cluster" msgstr "更新Cluster" @@ -1254,25 +1254,24 @@ msgstr "资产组列表" msgid "Asset group detail" msgstr "资产组详情" -#: assets/views/system_user.py:31 +#: assets/views/system_user.py:29 msgid "System user list" msgstr "系统用户列表" -#: assets/views/system_user.py:63 +#: assets/views/system_user.py:61 msgid "Update system user" msgstr "更新系统用户" -#: assets/views/system_user.py:78 +#: assets/views/system_user.py:76 msgid "System user detail" msgstr "系统用户详情" -#: assets/views/system_user.py:99 +#: assets/views/system_user.py:97 msgid "System user asset" msgstr "系统用户集群资产" #: common/const.py:6 #, python-format -#| msgid "User group {name} was created successfully" msgid "%(name)s was created successfully" msgstr "%(name)s 创建成功" @@ -1570,7 +1569,7 @@ msgstr "选择用户" #: terminal/templates/terminal/session_list.html:33 #: terminal/templates/terminal/session_list.html:71 users/forms.py:187 #: users/models/user.py:31 users/templates/users/user_group_detail.html:78 -#: users/views/user.py:345 +#: users/views/user.py:338 msgid "User" msgstr "用户" @@ -1786,7 +1785,7 @@ msgstr "关闭" #: users/views/group.py:62 users/views/group.py:79 users/views/login.py:193 #: users/views/login.py:242 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:363 users/views/user.py:385 +#: users/views/user.py:319 users/views/user.py:356 users/views/user.py:378 msgid "Users" msgstr "用户管理" @@ -2672,20 +2671,16 @@ msgstr "文件不合法" msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:332 -#, python-brace-format -msgid "Create user {name} successfully." -msgstr "创建用户 {name} 成功" - -#: users/views/user.py:346 +#: users/views/user.py:339 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:364 +#: users/views/user.py:357 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:386 +#: users/views/user.py:379 msgid "Public key update" msgstr "秘钥更新" +