From d9c9840a35e9dbf7c56e1f340b0d7147d8592d94 Mon Sep 17 00:00:00 2001
From: ZQHcode <1550050864@qq.com>
Date: Wed, 8 Nov 2023 15:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E5=9E=8B=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=E5=9B=BD=E9=99=85=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/language/default/property.json             |  4 ++++
 resources/language/en/property.json                  |  6 +++++-
 .../coreservice/service/translate.go                 | 12 ++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/resources/language/default/property.json b/resources/language/default/property.json
index 3fda400c53..48146e1d8d 100644
--- a/resources/language/default/property.json
+++ b/resources/language/default/property.json
@@ -1,6 +1,10 @@
 {
     "common_property_bk_inst_name": "实例名",
     "common_property_bk_inst_id": "实例ID",
+    "common_property_bk_created_at": "创建时间",
+    "common_property_bk_created_by": "创建人",
+    "common_property_bk_updated_at": "更新时间",
+    "common_property_bk_updated_by": "更新人",
     "biz_property_bk_biz_name": "业务名",
     "biz_property_life_cycle": "生命周期",
     "biz_property_bk_biz_maintainer": "运维人员",
diff --git a/resources/language/en/property.json b/resources/language/en/property.json
index 6034a0c7e1..d539623d8b 100644
--- a/resources/language/en/property.json
+++ b/resources/language/en/property.json
@@ -1,6 +1,10 @@
 {
-    "common_property_bk_inst_name": "Instance name",
+    "common_property_bk_inst_name": "Instance Name",
     "common_property_bk_inst_id": "Instance ID",
+    "common_property_bk_created_at": "Created At",
+    "common_property_bk_created_by": "Created By",
+    "common_property_bk_updated_at": "Updated At",
+    "common_property_bk_updated_by": "Updated By",
     "biz_property_bk_biz_name": "Business name",
     "biz_property_life_cycle": "Lifecycle",
     "biz_property_bk_biz_maintainer": "Maintainer",
diff --git a/src/source_controller/coreservice/service/translate.go b/src/source_controller/coreservice/service/translate.go
index eca11fa8ad..652b138bd2 100644
--- a/src/source_controller/coreservice/service/translate.go
+++ b/src/source_controller/coreservice/service/translate.go
@@ -48,9 +48,17 @@ func (s *coreService) TranslateInstName(defLang language.DefaultCCLanguageIf, ob
 	return util.FirstNotEmptyString(defLang.Language("inst_"+obj.ObjectID), obj.ObjectName, obj.ObjectID)
 }
 
-// TranslatePropertyName TODO
+// TranslatePropertyName translate property name
 func (s *coreService) TranslatePropertyName(defLang language.DefaultCCLanguageIf, att *metadata.Attribute) string {
-	return util.FirstNotEmptyString(defLang.Language(att.ObjectID+"_property_"+att.PropertyID), att.PropertyName,
+	var prefix string
+	switch att.PropertyID {
+	case common.BKInstNameField, common.BKCreatedAt, common.BKCreatedBy, common.BKUpdatedAt, common.BKUpdatedBy:
+		prefix = "common"
+	default:
+		prefix = att.ObjectID
+	}
+
+	return util.FirstNotEmptyString(defLang.Language(prefix+"_property_"+att.PropertyID), att.PropertyName,
 		att.PropertyID)
 }