fix: fix i18n duplicates

Author: hsluoyz

web/src/MachineEditPage.js

@@ -93,10 +93,10 @@ class MachineEditPage extends React.Component {
           </Space>
         </div>
 
-        <Card size="small" title={renderCardTitle(i18next.t("general:General Settings"), i18next.t("machine:General Settings desc"))} style={sectionCardStyle} headStyle={cardHeadStyle}>
+        <Card size="small" title={renderCardTitle(i18next.t("general:General Settings"), i18next.t("general:General Settings desc"))} style={sectionCardStyle} headStyle={cardHeadStyle}>
           <Row gutter={rowGutter}>
             {this.renderField(
-              Setting.getLabel(i18next.t("general:Name"), i18next.t("machine:Name - Tooltip")),
+              Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip")),
               <Input value={machine.name} disabled onChange={e => this.updateMachineField("name", e.target.value)} />,
               8
             )}
@@ -106,11 +106,11 @@ class MachineEditPage extends React.Component {
               8
             )}
             {this.renderField(
-              Setting.getLabel(i18next.t("machine:Role"), i18next.t("machine:Role - Tooltip")),
+              Setting.getLabel(i18next.t("policy:Role"), i18next.t("machine:Role - Tooltip")),
               <Select
                 value={machine.role || undefined}
                 allowClear
-                placeholder={i18next.t("machine:Role")}
+                placeholder={i18next.t("policy:Role")}
                 style={{width: "100%"}}
                 options={[
                   {label: "master", value: "master"},

web/src/MachineListPage.js

@@ -139,7 +139,7 @@ class MachineListPage extends React.Component {
         width: "120px",
       },
       {
-        title: i18next.t("machine:Role"),
+        title: i18next.t("policy:Role"),
         dataIndex: "role",
         key: "role",
         width: "120px",
@@ -206,19 +206,19 @@ class MachineListPage extends React.Component {
           destroyOnHidden
         >
           <Form ref={this.formRef} layout="vertical">
-            <Form.Item label={i18next.t("general:Name")} name="name" rules={[{required: true, message: i18next.t("rbac:required")}, {pattern: /^[a-z0-9-]+$/, message: "lowercase letters, digits and dashes only"}]}>
+            <Form.Item label={i18next.t("general:Name")} name="name" rules={[{required: true, message: i18next.t("policy:required")}, {pattern: /^[a-z0-9-]+$/, message: "lowercase letters, digits and dashes only"}]}>
               <Input placeholder="my-machine" />
             </Form.Item>
             <Form.Item label={i18next.t("general:Display name")} name="displayName">
               <Input placeholder="My Machine" />
             </Form.Item>
-            <Form.Item label={i18next.t("machine:IP address")} name="ip" rules={[{required: true, message: i18next.t("rbac:required")}]}>
+            <Form.Item label={i18next.t("machine:IP address")} name="ip" rules={[{required: true, message: i18next.t("policy:required")}]}>
               <Input placeholder="192.168.1.10" />
             </Form.Item>
-            <Form.Item label={i18next.t("machine:SSH port")} name="port" rules={[{required: true, message: i18next.t("rbac:required")}]}>
+            <Form.Item label={i18next.t("machine:SSH port")} name="port" rules={[{required: true, message: i18next.t("policy:required")}]}>
               <InputNumber style={{width: "100%"}} min={1} max={65535} />
             </Form.Item>
-            <Form.Item label={i18next.t("machine:Username")} name="username" rules={[{required: true, message: i18next.t("rbac:required")}]}>
+            <Form.Item label={i18next.t("machine:Username")} name="username" rules={[{required: true, message: i18next.t("policy:required")}]}>
               <Input placeholder="root" />
             </Form.Item>
             <Form.Item label={i18next.t("machine:Auth type")} name="authType">
@@ -229,11 +229,11 @@ class MachineListPage extends React.Component {
             </Form.Item>
             <Form.Item noStyle shouldUpdate={(prev, cur) => prev.authType !== cur.authType}>
               {({getFieldValue}) => getFieldValue("authType") === "privateKey" ? (
-                <Form.Item label={i18next.t("machine:Private key")} name="privateKey" rules={[{required: true, message: i18next.t("rbac:required")}]}>
+                <Form.Item label={i18next.t("machine:Private key")} name="privateKey" rules={[{required: true, message: i18next.t("policy:required")}]}>
                   <Input.TextArea rows={4} placeholder="-----BEGIN OPENSSH PRIVATE KEY-----" />
                 </Form.Item>
               ) : (
-                <Form.Item label={i18next.t("machine:Password")} name="password" rules={[{required: true, message: i18next.t("rbac:required")}]}>
+                <Form.Item label={i18next.t("machine:Password")} name="password" rules={[{required: true, message: i18next.t("policy:required")}]}>
                   <Input.Password />
                 </Form.Item>
               )}

web/src/TrivyScanPage.js

@@ -84,7 +84,7 @@ class TrivyScanPage extends React.Component {
         render: (v) => <Text code style={{wordBreak: "break-all"}}>{v}</Text>,
       },
       {
-        title: i18next.t("trivy:Status"),
+        title: i18next.t("general:Status"),
         dataIndex: "status",
         key: "status",
         width: 100,

web/src/locales/en/data.json

@@ -25,7 +25,6 @@
     "Content": "Content",
     "Content desc": "Page content configuration",
     "Cron Jobs": "Cron Jobs",
-    "Horizontal Pod Autoscaler": "Horizontal Pod Autoscaler",
     "Dashboard": "Dashboard",
     "Delete": "Delete",
     "Deployments": "Deployments",
@@ -45,11 +44,13 @@
     "General Settings desc": "Basic site information",
     "HTML title": "HTML title",
     "HTML title - Tooltip": "Text shown in the browser tab and window title bar for this site",
+    "Horizontal Pod Autoscaler": "Horizontal Pod Autoscaler",
     "Image": "Image",
     "Image Scan": "Image Scan",
     "Infrastructure": "Infrastructure",
     "Ingresses": "Ingresses",
     "Loading...": "Loading...",
+    "Log Search": "Log Search",
     "Logo URL": "Logo URL",
     "Logo URL - Tooltip": "URL of the image displayed as the site logo in the header",
     "Machines": "Machines",
@@ -63,9 +64,9 @@
     "Nodes": "Nodes",
     "OK": "OK",
     "Persistent Volume Claims": "Persistent Volume Claims",
+    "Pods": "Pods",
     "Resource Quotas": "Resource Quotas",
     "Role Bindings": "Role Bindings",
-    "Pods": "Pods",
     "Save": "Save",
     "Secrets": "Secrets",
     "ServiceAccounts": "Service Accounts",
@@ -81,6 +82,27 @@
     "Sure to delete": "Sure to delete",
     "Workloads": "Workloads"
   },
+  "machine": {
+    "Add Machine": "Add Machine",
+    "Auth type": "Auth type",
+    "Auth type - Tooltip": "Auth type - Tooltip",
+    "Edit Machine": "Edit Machine",
+    "IP address": "IP address",
+    "IP address - Tooltip": "IP address - Tooltip",
+    "Operating system": "Operating system",
+    "Operating system - Tooltip": "Operating system - Tooltip",
+    "Password": "Password",
+    "Password - Tooltip": "Password - Tooltip",
+    "Private key": "Private key",
+    "Private key - Tooltip": "Private key - Tooltip",
+    "Role - Tooltip": "Role - Tooltip",
+    "SSH Credentials": "SSH Credentials",
+    "SSH Credentials desc": "SSH Credentials desc",
+    "SSH port": "SSH port",
+    "SSH port - Tooltip": "SSH port - Tooltip",
+    "Username": "Username",
+    "Username - Tooltip": "Username - Tooltip"
+  },
   "policy": {
     "Add Rule": "Add Rule",
     "Delete this rule?": "Delete this rule?",
@@ -149,7 +171,6 @@
     "Scanned At": "Scanned At",
     "Severity": "Severity",
     "Start Scan": "Start Scan",
-    "Status": "Status",
     "Title": "Title",
     "page desc": "Scans container images for known CVE vulnerabilities using Trivy. Images with CRITICAL findings are blocked by the Admission Webhook.",
     "scan may take minutes": "Scanning may take 1–3 minutes depending on the image size and vulnerability database."

web/src/locales/zh/data.json

@@ -25,13 +25,14 @@
     "Content": "内容",
     "Content desc": "页面内容配置",
     "Cron Jobs": "定时任务",
-    "Horizontal Pod Autoscaler": "水平自动伸缩",
     "Dashboard": "仪表盘",
     "Delete": "删除",
     "Deployments": "部署",
+    "Description": "Description",
     "Display name": "显示名称",
     "Display name - Tooltip": "在界面中展示的友好名称，代替内部标识符显示给用户",
     "Edit": "编辑",
+    "Failed to add": "Failed to add",
     "Failed to delete": "删除失败",
     "Failed to get": "获取失败",
     "Failed to save": "保存失败",
@@ -43,12 +44,16 @@
     "General Settings desc": "站点基本信息",
     "HTML title": "HTML标题",
     "HTML title - Tooltip": "显示在浏览器标签页和窗口标题栏中的文字",
+    "Horizontal Pod Autoscaler": "水平自动伸缩",
     "Image": "镜像",
     "Image Scan": "镜像扫描",
+    "Infrastructure": "Infrastructure",
     "Ingresses": "入口",
     "Loading...": "加载中...",
+    "Log Search": "Log Search",
     "Logo URL": "Logo地址",
     "Logo URL - Tooltip": "显示在页头的Logo图片地址",
+    "Machines": "Machines",
     "Name": "名称",
     "Name - Tooltip": "站点的唯一标识符，用于URL和API调用",
     "Namespaces": "命名空间",
@@ -59,9 +64,9 @@
     "Nodes": "节点",
     "OK": "确定",
     "Persistent Volume Claims": "存储卷",
+    "Pods": "容器组",
     "Resource Quotas": "资源配额",
     "Role Bindings": "角色绑定",
-    "Pods": "容器组",
     "Save": "保存",
     "Secrets": "密钥",
     "ServiceAccounts": "服务账户",
@@ -70,11 +75,34 @@
     "Stateful Sets": "有状态副本集",
     "Static base URL": "静态资源根地址",
     "Static base URL - Tooltip": "CDN或静态文件服务器的根地址，所有静态资源路径都以此为前缀",
+    "Status": "Status",
+    "Successfully added": "Successfully added",
     "Successfully deleted": "删除成功",
     "Successfully saved": "保存成功",
     "Sure to delete": "确认删除",
     "Workloads": "工作负载"
   },
+  "machine": {
+    "Add Machine": "Add Machine",
+    "Auth type": "Auth type",
+    "Auth type - Tooltip": "Auth type - Tooltip",
+    "Edit Machine": "Edit Machine",
+    "IP address": "IP address",
+    "IP address - Tooltip": "IP address - Tooltip",
+    "Operating system": "Operating system",
+    "Operating system - Tooltip": "Operating system - Tooltip",
+    "Password": "Password",
+    "Password - Tooltip": "Password - Tooltip",
+    "Private key": "Private key",
+    "Private key - Tooltip": "Private key - Tooltip",
+    "Role - Tooltip": "Role - Tooltip",
+    "SSH Credentials": "SSH Credentials",
+    "SSH Credentials desc": "SSH Credentials desc",
+    "SSH port": "SSH port",
+    "SSH port - Tooltip": "SSH port - Tooltip",
+    "Username": "Username",
+    "Username - Tooltip": "Username - Tooltip"
+  },
   "policy": {
     "Add Rule": "添加规则",
     "Delete this rule?": "确认删除此规则？",
@@ -143,7 +171,6 @@
     "Scanned At": "扫描时间",
     "Severity": "严重等级",
     "Start Scan": "开始扫描",
-    "Status": "状态",
     "Title": "漏洞描述",
     "page desc": "使用 Trivy 扫描容器镜像中的已知 CVE 漏洞。包含 CRITICAL 漏洞的镜像将被准入 Webhook 拦截，禁止部署。",
     "scan may take minutes": "扫描可能需要 1–3 分钟，取决于镜像大小和漏洞库状态。"