Skip to content

Commit

Permalink
chore: update locale in connection
Browse files Browse the repository at this point in the history
  • Loading branch information
dongchengjie committed May 20, 2024
1 parent 08e0d6a commit fb38047
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 28 deletions.
31 changes: 17 additions & 14 deletions src/components/connection/connection-detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,32 @@ const InnerConnectionDetail = ({ data, onClose }: InnerProps) => {
: `${metadata.destinationIP}:${metadata.destinationPort}`;

const information = [
{ label: "Host", value: host },
{ label: "Download", value: parseTraffic(data.download).join(" ") },
{ label: "Upload", value: parseTraffic(data.upload).join(" ") },
{ label: t("Host"), value: host },
{ label: t("Downloaded"), value: parseTraffic(data.download).join(" ") },
{ label: t("Uploaded"), value: parseTraffic(data.upload).join(" ") },
{
label: "DL Speed",
label: t("DL Speed"),
value: parseTraffic(data.curDownload ?? -1).join(" ") + "/s",
},
{
label: "UL Speed",
label: t("UL Speed"),
value: parseTraffic(data.curUpload ?? -1).join(" ") + "/s",
},
{ label: "Chains", value: chains },
{ label: "Rule", value: rule },
{ label: t("Chains"), value: chains },
{ label: t("Rule"), value: rule },
{
label: "Process",
label: t("Process"),
value: `${metadata.process}${
metadata.processPath ? `(${metadata.processPath})` : ""
}`,
},
{ label: "Time", value: dayjs(data.start).fromNow() },
{ label: "Source", value: `${metadata.sourceIP}:${metadata.sourcePort}` },
{ label: "Destination IP", value: metadata.destinationIP },
{ label: "Type", value: `${metadata.type}(${metadata.network})` },
{ label: t("Time"), value: dayjs(data.start).fromNow() },
{
label: t("Source"),
value: `${metadata.sourceIP}:${metadata.sourcePort}`,
},
{ label: t("Destination IP"), value: metadata.destinationIP },
{ label: t("Type"), value: `${metadata.type}(${metadata.network})` },
];

const onDelete = useLockFn(async () => deleteConnection(data.id));
Expand All @@ -92,13 +95,13 @@ const InnerConnectionDetail = ({ data, onClose }: InnerProps) => {
<Box sx={{ textAlign: "right" }}>
<Button
variant="contained"
title="Close Connection"
title={t("Close Connection")}
onClick={() => {
onDelete();
onClose?.();
}}
>
{t("Close")}
{t("Close Connection")}
</Button>
</Box>
</Box>
Expand Down
25 changes: 13 additions & 12 deletions src/components/connection/connection-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from "@mui/x-data-grid";
import { truncateStr } from "@/utils/truncate-str";
import parseTraffic from "@/utils/parse-traffic";
import { t } from "i18next";

interface Props {
connections: IConnectionsItem[];
Expand All @@ -21,10 +22,10 @@ export const ConnectionTable = (props: Props) => {
>({});

const columns: GridColDef[] = [
{ field: "host", headerName: "Host", flex: 220, minWidth: 220 },
{ field: "host", headerName: t("Host"), flex: 220, minWidth: 220 },
{
field: "download",
headerName: "Download",
headerName: t("Downloaded"),
width: 88,
align: "right",
headerAlign: "right",
Expand All @@ -33,7 +34,7 @@ export const ConnectionTable = (props: Props) => {
},
{
field: "upload",
headerName: "Upload",
headerName: t("Uploaded"),
width: 88,
align: "right",
headerAlign: "right",
Expand All @@ -42,7 +43,7 @@ export const ConnectionTable = (props: Props) => {
},
{
field: "dlSpeed",
headerName: "DL Speed",
headerName: t("DL Speed"),
width: 88,
align: "right",
headerAlign: "right",
Expand All @@ -51,19 +52,19 @@ export const ConnectionTable = (props: Props) => {
},
{
field: "ulSpeed",
headerName: "UL Speed",
headerName: t("UL Speed"),
width: 88,
align: "right",
headerAlign: "right",
valueFormatter: (params: GridValueFormatterParams<number>) =>
parseTraffic(params.value).join(" ") + "/s",
},
{ field: "chains", headerName: "Chains", flex: 360, minWidth: 360 },
{ field: "rule", headerName: "Rule", flex: 300, minWidth: 250 },
{ field: "process", headerName: "Process", flex: 240, minWidth: 120 },
{ field: "chains", headerName: t("Chains"), flex: 360, minWidth: 360 },
{ field: "rule", headerName: t("Rule"), flex: 300, minWidth: 250 },
{ field: "process", headerName: t("Process"), flex: 240, minWidth: 120 },
{
field: "time",
headerName: "Time",
headerName: t("Time"),
flex: 120,
minWidth: 100,
align: "right",
Expand All @@ -74,14 +75,14 @@ export const ConnectionTable = (props: Props) => {
valueFormatter: (params: GridValueFormatterParams<string>) =>
dayjs(params.value).fromNow(),
},
{ field: "source", headerName: "Source", flex: 200, minWidth: 130 },
{ field: "source", headerName: t("Source"), flex: 200, minWidth: 130 },
{
field: "destinationIP",
headerName: "Destination IP",
headerName: t("Destination IP"),
flex: 200,
minWidth: 130,
},
{ field: "type", headerName: "Type", flex: 160, minWidth: 100 },
{ field: "type", headerName: t("Type"), flex: 160, minWidth: 100 },
];

const connRows = useMemo(() => {
Expand Down
14 changes: 14 additions & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"Test URL": "Test URL",
"Test All": "Test All",

"Paste": "Paste",
"Profiles": "Profiles",
"Profile URL": "Profile URL",
"Import": "Import",
Expand Down Expand Up @@ -70,6 +71,19 @@
"Update All": "Update All",
"Update At": "Update At",

"Host": "Host",
"Downloaded": "Downloaded",
"Uploaded": "Uploaded",
"DL Speed": "DL Speed",
"UL Speed": "UL Speed",
"Chains": "Chains",
"Rule": "Rule",
"Process": "Process",
"Time": "Time",
"Source": "Source",
"Destination IP": "Destination IP",
"Close Connection": "Close Connection",

"Type": "Type",
"Name": "Name",
"Descriptions": "Descriptions",
Expand Down
14 changes: 14 additions & 0 deletions src/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"Test URL": "Тестовый URL",
"Test All": "Тест Все",

"Paste": "Вставить",
"Profiles": "Профили",
"Profile URL": "URL профиля",
"Import": "Импорт",
Expand Down Expand Up @@ -70,6 +71,19 @@
"Update All": "Обновить все",
"Update At": "Обновлено в",

"Host": "Хост",
"Downloaded": "Скачано",
"Uploaded": "Загружено",
"DL Speed": "Скорость загрузки",
"UL Speed": "Скорость выгрузки",
"Chains": "Цепочки",
"Rule": "Правило",
"Process": "Процесс",
"Time": "Время подключения",
"Source": "Исходный адрес",
"Destination IP": "IP-адрес назначения",
"Close Connection": "Закрыть соединение",

"Type": "Тип",
"Name": "Название",
"Descriptions": "Описания",
Expand Down
14 changes: 14 additions & 0 deletions src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"Test URL": "测试地址",
"Test All": "测试全部",

"Paste": "粘贴",
"Profiles": "订阅",
"Profile URL": "订阅文件链接",
"Import": "导入",
Expand Down Expand Up @@ -70,6 +71,19 @@
"Update All": "更新全部",
"Update At": "更新于",

"Host": "主机",
"Downloaded": "下载量",
"Uploaded": "上传量",
"DL Speed": "下载速度",
"UL Speed": "上传速度",
"Chains": "链路",
"Rule": "规则",
"Process": "进程",
"Time": "连接时间",
"Source": "源地址",
"Destination IP": "目标地址",
"Close Connection": "关闭连接",

"Type": "类型",
"Name": "名称",
"Descriptions": "描述",
Expand Down
8 changes: 6 additions & 2 deletions src/pages/connections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,12 @@ const ConnectionsPage = () => {
contentStyle={{ height: "100%" }}
header={
<Box sx={{ display: "flex", alignItems: "center", gap: 2 }}>
<Box sx={{ mx: 1 }}>Download: {parseTraffic(download)}</Box>
<Box sx={{ mx: 1 }}>Upload: {parseTraffic(upload)}</Box>
<Box sx={{ mx: 1 }}>
{t("Downloaded")}: {parseTraffic(download)}
</Box>
<Box sx={{ mx: 1 }}>
{t("Uploaded")}: {parseTraffic(upload)}
</Box>
<IconButton
color="inherit"
size="small"
Expand Down

0 comments on commit fb38047

Please sign in to comment.