From 45f6a62989e4a21912ef1e0b6ef55c3f08d497e6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 1 Feb 2018 12:37:45 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E5=A4=84?= =?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/common/api.py | 2 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 32040 -> 32093 bytes apps/i18n/zh/LC_MESSAGES/django.po | 9 +++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/common/api.py b/apps/common/api.py index e75f6147a..eb108e94e 100644 --- a/apps/common/api.py +++ b/apps/common/api.py @@ -88,7 +88,7 @@ class LDAPTestingAPI(APIView): user[attr] = getattr(entry, mapping) users.append(user) if len(users) > 0: - return Response({"msg": "Match {} s users".format(len(users))}) + return Response({"msg": _("Match {} s users").format(len(users))}) else: return Response({"error": "Have user but attr mapping error"}, status=401) else: diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 427132b968402d3fd08928f243d95923ed9d587b..a081929ebac7444c3763c8875da4f88a3dfddf48 100644 GIT binary patch delta 10759 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\n" "Language-Team: Jumpserver team\n" @@ -1258,6 +1258,10 @@ msgstr "邮件已经发送{}, 请检查" msgid "Test ldap success" msgstr "连接LDAP成功" +#: common/api.py:91 +msgid "Match {} s users" +msgstr "匹配 {} 个用户" + #: common/const.py:6 #, python-format msgid "%(name)s was created successfully" @@ -1357,7 +1361,8 @@ msgstr "LDAP属性映射" msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," "email is jumpserver attr" -msgstr "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上,username, name," +msgstr "" +"用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上,username, name," "email 是jumpserver的属性" #: common/forms.py:137