From 2992bc2faebe7b093e49cb6f1c273297ea278210 Mon Sep 17 00:00:00 2001
From: simontigers <47096077+simontigers@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:29:49 +0800
Subject: [PATCH] fix(api): common_i18n wide (#350)

---
 cmdb-api/api/lib/common_setting/department.py |   2 ++
 .../api/lib/common_setting/resp_format.py     |   4 +++-
 .../translations/zh/LC_MESSAGES/messages.mo   | Bin 16386 -> 16425 bytes
 .../translations/zh/LC_MESSAGES/messages.po   |   6 +++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

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 a02d5eb49fa4e3204377eb0864e2041f8f3bc127..8620fafd5bd7abaccfcc6ff3767e122c9e60c697 100644
GIT binary patch
delta 3265
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

delta 3240
zcmYM!3rv<(9LMoLkq*rpFE>HO*Srf9AeXoZsE~@<9N=Y6YnaQ>Ch8Pi(>>@cX;L^F
zW`=ZeQZZ~IYbJJqGAC|jx#hfKjhwo&IhJ!vq`p7iv&HoNoO7P@obx~bbI$W=RnX3=
zAg{~!c%AWgn*XEupFL2u|NmADF^i(Q(zyl4QhyUi;!)IlXD|l4aRT;X1dbmXXwSfj
z)Jt#-zKXGCo*kf&NW%$SjJGijbB39X!!6EtP!pX*4R8@B<KNEF!_D%k=VJ)Ifj-=a
zS$G5|;cxgPhKw)^XMT&L5Jp2DDv%OP#n(_1oI+)w8>8_dY9$e&{VT96RA9?d8L33|
z+l$InlY4&7wcm2>K}0u-`E4A9@i+suvQj-j50%3Akbl;~PdJ`-^~=au_NS}&p#lhH
zHQI`47>NZKhbvGStwvIBP3Wm(Ck0LTJF>X`S;(q|GMfVMqgIrLdU27n9Lc7=g?ZS3
z%G3>1iXWiHjbRW4nuZ!@E^3@r5#(PH?Vv#&4?DkcUd88We}Kx&5|$%3qYl|V)PyIT
z=TYO_!b}Y2VLImE(^!E#vPL8}`znh3b5QL94O;mPRD}0XsT|CY9M6y1vrz#rK@GGO
zNt)H7GI<yk*w?P!jl^z!sEmX&NG_)1EUfe>=#aFb4%-z>!p9g*FQniUT#8zG6)N%u
z)S+v|8Tb?OstsfLO6?R(#5t(5wbfaV>er4M-@8IVd-Djjvf+#>lhBXF&do>{t8=!X
zR{8^yEbBoHJeVj|pMY9<HWpwJY9R+uhp_`QbpP*CP%0)9wgy~_i?9~+@K@A}<498$
z79ua&>$n)(F%={IoOoP-%4DUhzmLkqIn?+MQD?!=DktjxFQT9UDo_(NqXxQ-IT%Ks
zn8S)N7dPR2JdTCfhg#u0@=VccQ2`&vS$GxM9gAglWhetxFUB#<Z|f=0$7)a$9K%e!
zhuZ5nzBbyTJXC6nP={}=tM5Sddl%L3GhB!5n1b<q_NHSgK81CtFX3r^Jf-3f3JExh
zyy@Q0L*0gDsM}G7e3h*NNs8@4P1uN9@hPkhGV4OEY|YewJ5dWe<mw&hr+&@VA5A6y
ziex1D=KNSLYJe5Ujj>A9O825B{1}zmFR>7BqTWyBL@BjPof}d8_qh58NHVPrwSXI_
zj0DA#f2}YzKCt3hNN`q+3TQhjfP<(nT?;BR9jJa6P-mwXHE=R%<ST3?7=de08Q6|`
z|3g=AL1q3IkAn7O06!dbOF`{%F=_?tP}i;sm63W^|J?aAYNETS34$3_0feCfo#g82
z&O+x()VSUT3L3b^Jvf4#8~Xya@-9?B_g#G`cS-FNP!naLCVI}bzkmv;0=d~%gWA$2
zRR8ZW880DUPS2j;bEingq6W^w;aG&)(^am08){45cJ0Sd1D|vCn^-{oUsS&WX6b+5
zxeYb`e$*%XC`Rf2cTmtFx{NwpIvIL#D*AA?bBVLexeYZ@EvkPrYJxMa{W@w(|G^O$
zof0@}(@+ac$7tREIqpFzDs}7i0C!<FHed!`#jzNX8n||;$U(Mc*xw(O$p&W|Y5^CW
zcaW@GFDlT4H1f}twR{SS^cB>K_Mis*#Q7~oP``#+Ne?RZ!Rdjs5sTXEG*o+uYcI!e
z>bqTgy=y<=JfBYf)!`NmnxGds$mV+{uq885D}EWd>Q;@)L@SQOyO@guX(T3l7S(?{
zs{bL>H9d<num|<QO3VxdT%73zCf-PcGO!zUj~h_|okeA+3!`yh7N1k}BTcptweo7z
zz>OG&ov5w3j_jHZVjnpMmV?A#n^5C5dlW`fID>49bz=-h6K*7?U=+?rP4psa<vUQB
zI*6L66Sdd(QCk#}6L>Eg6;Ki?(*>x7Ek_+fZv%ye6sl0E`w{iU`U_*xM}8GZ68dp2
zDnn&B2>0L+taJ5`T)i3f{z+6omr#M<L7O>yfxmS1YX7G4*2*Ei0j>K(zl$6?Js~MM
YAvw*Tn30*1)cVqtngOl72?@Uc0FKg7-v9sr

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 <EMAIL@ADDRESS>\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 "登录成功"