From 90fea7650651cd807da15531212ba5fbf5eef843 Mon Sep 17 00:00:00 2001 From: schnee Date: Wed, 27 Nov 2024 18:31:57 +0800 Subject: [PATCH] fix: resolve #1992 conversations --- src/bk-user/bkuser/plugins/ldap/plugin.py | 2 +- src/bk-user/locale/en/LC_MESSAGES/django.po | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/bk-user/bkuser/plugins/ldap/plugin.py b/src/bk-user/bkuser/plugins/ldap/plugin.py index 53e66755a..c99a32fd1 100644 --- a/src/bk-user/bkuser/plugins/ldap/plugin.py +++ b/src/bk-user/bkuser/plugins/ldap/plugin.py @@ -261,6 +261,6 @@ def _validate_duplicate_codes(raw_objs: List[RawDataSourceDepartment] | List[Raw exist_codes = set() for obj in raw_objs: if obj.code in exist_codes: - raise ValueError(f"duplicate code: {obj.code} found, check your ldap search base dn config!") + raise ValueError(f"duplicate code `{obj.code}` found, check your ldap search base dn config!") exist_codes.add(obj.code) diff --git a/src/bk-user/locale/en/LC_MESSAGES/django.po b/src/bk-user/locale/en/LC_MESSAGES/django.po index 682090475..be5e0d4bf 100644 --- a/src/bk-user/locale/en/LC_MESSAGES/django.po +++ b/src/bk-user/locale/en/LC_MESSAGES/django.po @@ -1925,7 +1925,7 @@ msgstr "Must provide user group object class" #: bkuser/plugins/ldap/models.py:126 msgid "需要提供用户组 Base DN" -msgstr "Must provide user base dn" +msgstr "Must provide user group base dn" #: bkuser/plugins/ldap/models.py:129 msgid "用户组 Base DN 数量不能超过 {} 个" @@ -2074,12 +2074,3 @@ msgstr "message" #: tests/utils/test_std_error.py:81 msgid "new message" msgstr "new message" - -#~ msgid "需要提供用户过滤器（DN）" -#~ msgstr "Must provide user search filter (DN)" - -#~ msgid "需要提供部门过滤器（DN）" -#~ msgstr "Must provide department search filter (DN)" - -#~ msgid "需要提供用户组过滤器（DN）" -#~ msgstr "Must provide user group search filter (DN)"