From 56fd18241da473f018aabb5dc1d0778007ef7f56 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 4 Jan 2018 09:29:54 +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 --- apps/assets/tasks.py | 2 +- apps/jumpserver/settings.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 28824 -> 28914 bytes apps/locale/zh/LC_MESSAGES/django.po | 9 +++++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index ab74c170a..233eee707 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -209,7 +209,7 @@ def test_asset_connectability_util(asset, task_name=None): from ops.utils import update_or_create_ansible_task if task_name is None: - task_name = "Test asset connectability" + task_name = _("Test asset connectability") hosts = [asset.hostname] tasks = const.TEST_ADMIN_USER_CONN_TASKS task, created = update_or_create_ansible_task( diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 1fe4478d5..214aba3aa 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -240,7 +240,7 @@ LOGGING = { # Internationalization # https://docs.djangoproject.com/en/1.10/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'zh-cn' TIME_ZONE = 'Asia/Shanghai' diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 93a4a3d4ab9367148f8aaeb812cf03c7667d5fb8..957d2083c75de066b91a2f9a0d61a54f9e9a7995 100644 GIT binary patch delta 8095 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 delta 8014 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index fe0ab8863..2177a1d2f 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -477,22 +477,27 @@ msgid "Update assets hardware info period" msgstr "定期更新资产硬件信息" #: assets/tasks.py:189 +#, python-format msgid "Test admin user connectability period: {}" -msgstr "定期测试管理用户可以连接性" +msgstr "定期测试管理用户可以连接性: {}" #: assets/tasks.py:203 +#, python-format msgid "Test admin user connectability: {}" msgstr "测试管理用户可连接性: {}" #: assets/tasks.py:289 +#, python-format msgid "Test system user connectability period: {}" msgstr "测试系统用户可连接性: {}" #: assets/tasks.py:363 +#, python-format msgid "Push system user to cluster assets: {}" msgstr "推送系统用户到资产: {}" #: assets/tasks.py:384 +#, python-format msgid "Push system user to cluster assets period: {}->{}" msgstr "定期推送系统用户到资产: {}->{}" @@ -1490,7 +1495,7 @@ msgstr "选择系统用户" #: perms/forms.py:52 msgid "User or group at least one required" -msgstr "" +msgstr "用户和组至少需要选一个" #: perms/forms.py:60 msgid "Asset or group at least one required"