fix: Fix event search resource title

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 21, 2020 · eff4ae4 · eff4ae4
1 parent af2987e
commit eff4ae4
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 7 deletions.
diff --git a/src/components/Modals/AuditingSearch/Auditing/Detail/index.jsx b/src/components/Modals/AuditingSearch/Auditing/Detail/index.jsx
@@ -151,7 +151,7 @@ export default class Detail extends React.PureComponent {
       className: styles.reasoncol,
     },
     {
-      thead: t('Resources'),
+      thead: t('Resource Name & Type'),
       key: 'resources',
       hidden: false,
       content: ({ ObjectRef = {} }) => (

diff --git a/src/components/Modals/EventSearch/Event/Detail/MetadataModal/index.jsx b/src/components/Modals/EventSearch/Event/Detail/MetadataModal/index.jsx
@@ -62,7 +62,7 @@ export default class MetadataModal extends React.Component {
           </div>
         </div>
         <div className={styles.row}>
-          <div className={styles.rowTitle}>{t('Resources')}</div>
+          <div className={styles.rowTitle}>{t('Resource')}</div>
           <div className={styles.rowDesc}>
             <span>{`[${involvedObject.kind}]`}</span>
             <span className={styles.namespace}>{involvedObject.name}</span>

diff --git a/src/components/Modals/EventSearch/Event/Detail/index.jsx b/src/components/Modals/EventSearch/Event/Detail/index.jsx
@@ -138,7 +138,7 @@ export default class Detail extends React.PureComponent {
       className: styles.namecol,
     },
     {
-      thead: t('Resources'),
+      thead: t('Resource Name & Type'),
       key: 'kind',
       hidden: false,
       content: ({ involvedObject = {} }) => (

diff --git a/src/locales/en/base.js b/src/locales/en/base.js
@@ -271,7 +271,7 @@ export default {
   Reselect: 'Reselect',
   Reset: 'Reset',
   'Resource List': 'Resource List',
-  Resources: 'Resources',
+  Resource: 'Resource',
   Restart: 'Restart',
   Running: 'Running',
   running: 'running',

diff --git a/src/locales/en/logging.js b/src/locales/en/logging.js
@@ -57,6 +57,7 @@ export default {
   'Refresh Rate': 'Refresh Rate',
   'Region Data': 'Region Data',
   'Release Collection': 'Release Collection',
+  'Resource Name & Type': 'Resource Name & Type',
   'Search Result': 'Search Result',
   'Search Rule': 'Search Rule',
   'Service Address': 'Service Address',

diff --git a/src/locales/tc/base.js b/src/locales/tc/base.js
@@ -455,7 +455,7 @@ export default {
   'rules desc':
     'KubeSphere可以根據您設置的規則進行操作審計的收集，點擊查看如何定義規則。',
   Category: '類别',
-  Resources: '資源',
+  Resource: '資源',
   'Earliest start time': '最早發生時間',
   'Most recent start time': '最近發生時間',
   'Related resources': '關聯資源',

diff --git a/src/locales/tc/logging.js b/src/locales/tc/logging.js
@@ -62,6 +62,8 @@ export default {
   'Fuzzy Query': '模糊匹配',
   'Log Collections': '紀錄收集',
 
+  'Resource Name & Type': '資源名稱與類型',
+
   'Search Auditing by': '通過{field}查詢審計',
   'Workspace Auditing Query Tip': '可以根據企業空間查看相關的操作審計',
   'Project Auditing Query Tip': '可以根據項目查看相關的操作審計',

diff --git a/src/locales/zh/base.js b/src/locales/zh/base.js
@@ -454,7 +454,7 @@ export default {
   'rules desc':
     'KubeSphere可以根据您设置的规则进行操作审计的收集，点击查看如何定义规则。',
   Category: '类别',
-  Resources: '资源',
+  Resource: '资源',
   'Earliest start time': '最早发生时间',
   'Most recent start time': '最近发生时间',
   'Related resources': '关联资源',

diff --git a/src/locales/zh/logging.js b/src/locales/zh/logging.js
@@ -111,6 +111,8 @@ export default {
   Activate: '激活',
   'Real-Time Data': '实时数据',
 
+  'Resource Name & Type': '资源名称与类型',
+
   TOOLBOX_SHIFT_TIPS: ' 👻 Shift + 鼠标左键 可以在新窗口中打开',
   'Hide help information': '不再显示帮助信息',
   ES_DESC: 'Elasticsearch 是分布式、RESTful 风格的搜索和分析引擎',

diff --git a/src/pages/clusters/containers/CustomResources/Detail/ResourceStatus/index.jsx b/src/pages/clusters/containers/CustomResources/Detail/ResourceStatus/index.jsx
@@ -122,7 +122,7 @@ export default class ResourceStatus extends React.Component {
     return {
       icon: 'select',
       desc: '',
-      name: ` ${kind} ${t('Resources')}`,
+      name: ` ${kind} ${t('Resource')}`,
     }
   }