diff --git a/cmdb-api/api/lib/common_setting/department.py b/cmdb-api/api/lib/common_setting/department.py index f068b53..d63d43b 100644 --- a/cmdb-api/api/lib/common_setting/department.py +++ b/cmdb-api/api/lib/common_setting/department.py @@ -101,6 +101,7 @@ class DepartmentTree(object): employees = self.get_employees_by_d_id(department_id) top_d['employees'] = employees + top_d['department_name'] = ErrFormat.company_wide if len(sub_deps) == 0: top_d[sub_departments_column_name] = [] d_list.append(top_d) @@ -313,6 +314,7 @@ class DepartmentCRUD(object): tree_list = [] for top_d in top_deps: + top_d['department_name'] = ErrFormat.company_wide tree = Tree() identifier_root = top_d['department_id'] tree.create_node( diff --git a/cmdb-api/api/lib/common_setting/resp_format.py b/cmdb-api/api/lib/common_setting/resp_format.py index 12973ab..676e17b 100644 --- a/cmdb-api/api/lib/common_setting/resp_format.py +++ b/cmdb-api/api/lib/common_setting/resp_format.py @@ -66,7 +66,7 @@ class ErrFormat(CommonErrFormat): notice_platform_existed = _l("Notice platform {} existed") # {} 已存在 notice_not_existed = _l("Notice {} not existed") # {} 配置项不存在 notice_please_config_messenger_first = _l("Notice please config messenger first") # 请先配置messenger URL - notice_bind_err_with_empty_mobile = _l("Notice bind err with empty mobile") # 绑定错误,手机号为空 + notice_bind_err_with_empty_mobile = _l("Notice bind err with empty mobile") # 绑定错误,手机号为空 notice_bind_failed = _l("Notice bind failed: {}") # 绑定失败: {} notice_bind_success = _l("Notice bind success") # 绑定成功 notice_remove_bind_success = _l("Notice remove bind success") # 解绑成功 @@ -78,3 +78,5 @@ class ErrFormat(CommonErrFormat): ldap_test_unknown_error = _l("LDAP test unknown error: {}") # LDAP测试未知错误: {} common_data_not_support_auth_type = _l("Common data not support auth type: {}") # 通用数据不支持auth类型: {} ldap_test_username_required = _l("LDAP test username required") # LDAP测试用户名必填 + + company_wide = _l("Company wide") # 全公司 diff --git a/cmdb-api/api/translations/zh/LC_MESSAGES/messages.mo b/cmdb-api/api/translations/zh/LC_MESSAGES/messages.mo index a02d5eb..8620faf 100644 Binary files a/cmdb-api/api/translations/zh/LC_MESSAGES/messages.mo and b/cmdb-api/api/translations/zh/LC_MESSAGES/messages.mo differ diff --git a/cmdb-api/api/translations/zh/LC_MESSAGES/messages.po b/cmdb-api/api/translations/zh/LC_MESSAGES/messages.po index c27bf1a..1eeb467 100644 --- a/cmdb-api/api/translations/zh/LC_MESSAGES/messages.po +++ b/cmdb-api/api/translations/zh/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-12-26 09:41+0800\n" +"POT-Creation-Date: 2024-01-03 11:39+0800\n" "PO-Revision-Date: 2023-12-25 20:21+0800\n" "Last-Translator: FULL NAME \n" "Language: zh\n" @@ -688,6 +688,10 @@ msgstr "通用数据不支持auth类型: {}" msgid "LDAP test username required" msgstr "LDAP测试用户名必填" +#: api/lib/common_setting/resp_format.py:82 +msgid "Company wide" +msgstr "全公司" + #: api/lib/perm/acl/resp_format.py:9 msgid "login successful" msgstr "登录成功"