Skip to content

Commit

Permalink
fix: resolve #1992 conversations
Browse files Browse the repository at this point in the history
  • Loading branch information
narasux committed Nov 27, 2024
1 parent 3b48ff4 commit 90fea76
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/bk-user/bkuser/plugins/ldap/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
11 changes: 1 addition & 10 deletions src/bk-user/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 数量不能超过 {} 个"
Expand Down Expand Up @@ -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)"

0 comments on commit 90fea76

Please sign in to comment.