From 9d53ba22e19750e38b84be3b232ba6e3e71f031a Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Mon, 28 Jan 2019 14:59:06 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=8F=96=E6=B6=88ceph=E5=BD=95?= =?UTF-8?q?=E5=83=8F=E5=AD=98=E5=82=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=89=A7=E8=A1=8C=E7=BF=BB=E8=AF=91=20(#2365)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/replay_storage_create.html | 19 ++-- apps/locale/zh/LC_MESSAGES/django.mo | Bin 60570 -> 61912 bytes apps/locale/zh/LC_MESSAGES/django.po | 96 ++++++++++++++---- .../ops/command_execution_create.html | 12 +-- 4 files changed, 95 insertions(+), 32 deletions(-) diff --git a/apps/common/templates/common/replay_storage_create.html b/apps/common/templates/common/replay_storage_create.html index f26d924d2..a1781c2e3 100644 --- a/apps/common/templates/common/replay_storage_create.html +++ b/apps/common/templates/common/replay_storage_create.html @@ -35,7 +35,7 @@ - +{# #} @@ -109,11 +109,14 @@
- OSS: 格式 http://{REGION_NAME}.aliyuncs.com
- 如: http://oss-cn-hangzhou.aliyuncs.com + + {% trans 'OSS: http://{REGION_NAME}.aliyuncs.com' %} +
+ {% trans 'Example: http://oss-cn-hangzhou.aliyuncs.com' %}
- S3: http://s3.amazonaws.com
- S3中国: http://s3.amazonaws.com.cn
+ {% trans 'S3: http://s3.{REGION_NAME}.amazonaws.com' %}
+ {% trans 'S3(China): http://s3.{REGION_NAME}.amazonaws.com.cn' %}
+ {% trans 'Example: http://s3.cn-north-1.amazonaws.com.cn' %}
@@ -134,9 +137,9 @@
- 北京: cn-north-1 - 宁夏: cn-northwest-1 - 更多 + {% trans 'Beijing: cn-north-1' %} + {% trans 'Ningxia: cn-northwest-1' %} + {% trans 'More' %}
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 3826532e5ad8449479a0a0ebf8df6c1b8ade9f8f..33091ed2ff7a38ec8bd65ef51693f33807fbc510 100644 GIT binary patch delta 19451 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 38712017a..8502e7c3d 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-01-21 17:40+0800\n" +"POT-Creation-Date: 2019-01-28 12:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -17,11 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: assets/api/node.py:264 +#: assets/api/node.py:58 +msgid "You can't update the root node name" +msgstr "不能修改根节点名称" + +#: assets/api/node.py:281 msgid "Update node asset hardware information: {}" msgstr "更新节点资产硬件信息: {}" -#: assets/api/node.py:278 +#: assets/api/node.py:295 msgid "Test if the assets under the node are connectable: {}" msgstr "测试节点下资产是否可连接: {}" @@ -903,7 +907,7 @@ msgstr "其它" #: common/templates/common/command_storage_create.html:79 #: common/templates/common/email_setting.html:62 #: common/templates/common/ldap_setting.html:62 -#: common/templates/common/replay_storage_create.html:138 +#: common/templates/common/replay_storage_create.html:151 #: common/templates/common/security_setting.html:70 #: common/templates/common/terminal_setting.html:68 #: perms/templates/perms/asset_permission_create_update.html:80 @@ -936,7 +940,7 @@ msgstr "重置" #: common/templates/common/command_storage_create.html:80 #: common/templates/common/email_setting.html:63 #: common/templates/common/ldap_setting.html:63 -#: common/templates/common/replay_storage_create.html:139 +#: common/templates/common/replay_storage_create.html:152 #: common/templates/common/security_setting.html:71 #: common/templates/common/terminal_setting.html:70 #: perms/templates/perms/asset_permission_create_update.html:81 @@ -2198,17 +2202,52 @@ msgstr "账户密钥" msgid "Endpoint" msgstr "端点" +#: common/templates/common/replay_storage_create.html:113 +#, python-brace-format +msgid "OSS: http://{REGION_NAME}.aliyuncs.com" +msgstr "OSS: http://{REGION_NAME}.aliyuncs.com" + #: common/templates/common/replay_storage_create.html:115 +msgid "Example: http://oss-cn-hangzhou.aliyuncs.com" +msgstr "如: http://oss-cn-hangzhou.aliyuncs.com" + +#: common/templates/common/replay_storage_create.html:117 +#, python-brace-format +msgid "S3: http://s3.{REGION_NAME}.amazonaws.com" +msgstr "S3: http://s3.{REGION_NAME}.amazonaws.com" + +#: common/templates/common/replay_storage_create.html:118 +#, python-brace-format +msgid "S3(China): http://s3.{REGION_NAME}.amazonaws.com.cn" +msgstr "S3(中国): http://s3.{REGION_NAME}.amazonaws.com.cn" + +#: common/templates/common/replay_storage_create.html:119 +msgid "Example: http://s3.cn-north-1.amazonaws.com.cn" +msgstr "如: http://s3.cn-north-1.amazonaws.com.cn" + +#: common/templates/common/replay_storage_create.html:125 msgid "Endpoint suffix" msgstr "端点后缀" -#: common/templates/common/replay_storage_create.html:129 +#: common/templates/common/replay_storage_create.html:135 #: 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 "地域" +#: common/templates/common/replay_storage_create.html:140 +msgid "Beijing: cn-north-1" +msgstr "北京: cn-north-1" + +#: common/templates/common/replay_storage_create.html:141 +msgid "Ningxia: cn-northwest-1" +msgstr "宁夏: cn-northwest-1" + +#: common/templates/common/replay_storage_create.html:142 +msgid "More" +msgstr "更多" + #: common/templates/common/security_setting.html:46 msgid "Password check rule" msgstr "密码校验规则" @@ -2328,36 +2367,36 @@ msgstr "{} 任务开始: {}" msgid "{} Task finish" msgstr "{} 任务结束" -#: ops/models/adhoc.py:324 +#: ops/models/adhoc.py:323 msgid "Start time" msgstr "开始时间" -#: ops/models/adhoc.py:325 +#: ops/models/adhoc.py:324 msgid "End time" msgstr "完成时间" -#: ops/models/adhoc.py:326 ops/templates/ops/adhoc_history.html:57 +#: ops/models/adhoc.py:325 ops/templates/ops/adhoc_history.html:57 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:41 msgid "Time" msgstr "时间" -#: ops/models/adhoc.py:327 ops/templates/ops/adhoc_detail.html:106 +#: ops/models/adhoc.py:326 ops/templates/ops/adhoc_detail.html:106 #: ops/templates/ops/adhoc_history.html:55 #: ops/templates/ops/adhoc_history_detail.html:69 #: ops/templates/ops/task_detail.html:84 ops/templates/ops/task_history.html:61 msgid "Is finished" msgstr "是否完成" -#: ops/models/adhoc.py:328 ops/templates/ops/adhoc_history.html:56 +#: ops/models/adhoc.py:327 ops/templates/ops/adhoc_history.html:56 #: ops/templates/ops/task_history.html:62 msgid "Is success" msgstr "是否成功" -#: ops/models/adhoc.py:329 +#: ops/models/adhoc.py:328 msgid "Adhoc raw result" msgstr "结果" -#: ops/models/adhoc.py:330 +#: ops/models/adhoc.py:329 msgid "Adhoc result summary" msgstr "汇总" @@ -2479,8 +2518,6 @@ msgid "Success assets" msgstr "成功资产" #: ops/templates/ops/celery_task_log.html:4 -#, fuzzy -#| msgid "Task list" msgid "Task log" msgstr "任务列表" @@ -2490,6 +2527,32 @@ msgstr "任务列表" msgid "Go" msgstr "" +#: ops/templates/ops/command_execution_create.html:144 +msgid "Selected assets" +msgstr "已选择资产" + +#: ops/templates/ops/command_execution_create.html:147 +msgid "In total" +msgstr "总共" + +#: ops/templates/ops/command_execution_create.html:182 +msgid "" +"Select the left asset, select the running system user, execute command in " +"batch" +msgstr "选择左侧资产, 选择运行的系统用户,批量执行命令" + +#: ops/templates/ops/command_execution_create.html:200 +msgid "Unselected assets" +msgstr "没有选中资产" + +#: ops/templates/ops/command_execution_create.html:204 +msgid "No input command" +msgstr "没有输入命令" + +#: ops/templates/ops/command_execution_create.html:208 +msgid "No system user was selected" +msgstr "没有选择系统用户" + #: ops/templates/ops/command_execution_create.html:253 msgid "Pending" msgstr "" @@ -4667,9 +4730,6 @@ msgstr "更新组织" #~ msgid "No assets, task stop" #~ msgstr "没有匹配到资产,结束任务" -#~ msgid "You can't update the root node name" -#~ msgstr "不能修改根节点名称" - #~ msgid "Update assets hardware info period" #~ msgstr "定期更新资产硬件信息" diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html index e429e38ba..17a01e5c4 100644 --- a/apps/ops/templates/ops/command_execution_create.html +++ b/apps/ops/templates/ops/command_execution_create.html @@ -141,10 +141,10 @@ function onCheck(e, treeId, treeNode) { var nodes_names = nodes.map(function (node) { return node.name; }); - var message = "已选择资产: "; + var message = "{% trans 'Selected assets' %}" + ': '; message += nodes_names.join(", "); message += "\r\n"; - message += "总共: " + nodes_names.length + "个\r\n"; + message += "{% trans 'In total' %}" + ': ' + nodes_names.length + "个\r\n"; term.clear(); term.write(message) } @@ -179,7 +179,7 @@ function initResultTerminal() { } }); term.open(document.getElementById('term')); - term.write("选择左侧资产, 选择运行的系统用户,批量执行命令\r\n") + term.write("{% trans 'Select the left asset, select the running system user, execute command in batch' %}" + "\r\n") } function wrapperError(msg) { @@ -197,15 +197,15 @@ function execute() { return node.id; }); if (hosts.length === 0) { - term.write(wrapperError('没有选中资产')); + term.write(wrapperError("{% trans 'Unselected assets' %}")); return } if (!command) { - term.write(wrapperError('没有输入命令')); + term.write(wrapperError("{% trans 'No input command' %}")); return } if (!run_as) { - term.write(wrapperError('没有选择运行用户')); + term.write(wrapperError("{% trans 'No system user was selected' %}")); return } var data = {