-
域名列表
-
+
{t('domain.management.name')}
+
{!domains.length ? (
@@ -187,26 +190,26 @@ const Home = () => {
- 请添加域名开始部署证书吧。
+ {t('domain.management.empty')}
) : (
<>
-
域名
-
有效期限
-
最近执行状态
-
最近执行阶段
-
最近执行时间
-
是否启用
-
操作
+
{t('domain')}
+
{t('domain.management.expiry.date')}
+
{t('domain.management.last.execution.status')}
+
{t('domain.management.last.execution.stage')}
+
{t('domain.management.last.execution.time')}
+
{t('domain.management.enable')}
+
{t('operation')}
{domain.expiredAt ? (
<>
-
有效期90天
-
{getDate(domain.expiredAt)}到期
+
{t('domain.management.expiry.date1', { date: 90 })}
+
{t('domain.management.expiry.date2', { date: getDate(domain.expiredAt) })}
) : (
"---"
@@ -266,7 +269,7 @@ const Home = () => {
- {domain.enabled ? "禁用" : "启用"}
+ {domain.enabled ? t('disable') : t('enable')}
@@ -278,7 +281,7 @@ const Home = () => {
className="p-0"
onClick={() => handleHistoryClick(domain.id)}
>
- 部署历史
+ {t('deployment.log.name')}
@@ -287,7 +290,7 @@ const Home = () => {
className="p-0"
onClick={() => handleRightNowClick(domain)}
>
- 立即部署
+ {t('domain.management.start.deploying')}
@@ -304,7 +307,7 @@ const Home = () => {
className="p-0"
onClick={() => handleForceClick(domain)}
>
- 强行部署
+ {t('domain.management.forced.deployment')}
@@ -315,7 +318,7 @@ const Home = () => {
className="p-0"
onClick={() => handleDownloadClick(domain)}
>
- 下载
+ {t('download')}
@@ -325,24 +328,24 @@ const Home = () => {
- 删除域名
+ {t('domain.delete')}
- 确定要删除域名吗？
+ {t('domain.management.delete.confirm')}
- 取消
+ {t('cancel')}
{
handleDeleteClick(domain.id);
}}
>
- 确认
+ {t('confirm')}
@@ -354,7 +357,7 @@ const Home = () => {
className="p-0"
onClick={() => handleEditClick(domain.id)}
>
- 编辑
+ {t('edit')}
)}
diff --git a/ui/src/pages/history/History.tsx b/ui/src/pages/history/History.tsx
index 3db4db4..94dc756 100644
--- a/ui/src/pages/history/History.tsx
+++ b/ui/src/pages/history/History.tsx
@@ -17,11 +17,13 @@ import { list } from "@/repository/deployment";
import { Smile } from "lucide-react";
import { useEffect, useState } from "react";
import { useNavigate, useSearchParams } from "react-router-dom";
+import { useTranslation } from "react-i18next";
const History = () => {
const navigate = useNavigate();
const [deployments, setDeployments] = useState();
const [searchParams] = useSearchParams();
+ const { t } = useTranslation();
const domain = searchParams.get("domain");
useEffect(() => {
@@ -38,11 +40,11 @@ const History = () => {
return (
- 部署历史
+ {t('deployment.log.name')}
{!deployments?.length ? (
<>
- 暂无数据
+ {t('no.data')}
@@ -50,7 +52,7 @@ const History = () => {
{" "}
- 你暂未创建任何部署，请先添加域名进行部署吧！
+ {t('deployment.log.empty')}
@@ -59,7 +61,7 @@ const History = () => {
navigate("/");
}}
>
- 添加域名
+ {t('domain.add')}
@@ -68,16 +70,16 @@ const History = () => {
) : (
<>
-
域名
+
{t('domain')}
-
状态
-
阶段
-
最近执行时间
+
{t('deployment.log.status')}
+
{t('deployment.log.stage')}
+
{t('deployment.log.last.execution.time')}
-
操作
+
{t('operation')}
- 部署历史
+ {t('deployment.log.name')}
{deployments?.map((deployment) => (
@@ -104,14 +106,14 @@ const History = () => {
{deployment.expand.domain?.domain}-{deployment.id}
- 部署详情
+ {t('deployment.log.detail')}
diff --git a/ui/src/pages/login/Login.tsx b/ui/src/pages/login/Login.tsx
index d023a9b..9df8aa3 100644
--- a/ui/src/pages/login/Login.tsx
+++ b/ui/src/pages/login/Login.tsx
@@ -1,3 +1,8 @@
+import { useForm } from "react-hook-form";
+import { useNavigate } from "react-router-dom";
+import { z } from "zod";
+import { useTranslation } from 'react-i18next'
+
import { Button } from "@/components/ui/button";
import {
Form,
@@ -11,20 +16,19 @@ import { Input } from "@/components/ui/input";
import { getErrMessage } from "@/lib/error";
import { getPb } from "@/repository/api";
import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm } from "react-hook-form";
-import { useNavigate } from "react-router-dom";
-import { z } from "zod";
const formSchema = z.object({
username: z.string().email({
- message: "请输入正确的邮箱地址",
+ message: "login.username.no.empty.message",
}),
password: z.string().min(10, {
- message: "密码至少10个字符",
+ message: "login.password.length.message",
}),
});
const Login = () => {
+ const { t } = useTranslation()
+
const form = useForm
>({
resolver: zodResolver(formSchema),
defaultValues: {
@@ -61,7 +65,7 @@ const Login = () => {
name="username"
render={({ field }) => (
- 用户名
+ {t('username')}
@@ -76,7 +80,7 @@ const Login = () => {
name="password"
render={({ field }) => (
- 密码
+ {t('password')}
@@ -86,7 +90,7 @@ const Login = () => {
)}
/>
-
+
diff --git a/ui/src/pages/setting/Account.tsx b/ui/src/pages/setting/Account.tsx
index 65e6e62..c839f70 100644
--- a/ui/src/pages/setting/Account.tsx
+++ b/ui/src/pages/setting/Account.tsx
@@ -15,16 +15,18 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
import { z } from "zod";
const formSchema = z.object({
- email: z.string().email("请输入正确的邮箱"),
+ email: z.string().email("setting.account.email.valid.message"),
});
const Account = () => {
const { toast } = useToast();
const navigate = useNavigate();
+ const { t } = useTranslation();
const [changed, setChanged] = useState(false);
@@ -43,8 +45,8 @@ const Account = () => {
getPb().authStore.clear();
toast({
- title: "修改账户邮箱功",
- description: "请重新登录",
+ title: t("setting.account.email.change.succeed"),
+ description: t("setting.account.log.back.in"),
});
setTimeout(() => {
navigate("/login");
@@ -52,7 +54,7 @@ const Account = () => {
} catch (e) {
const message = getErrMessage(e);
toast({
- title: "修改账户邮箱失败",
+ title: t("setting.account.email.change.failed"),
description: message,
variant: "destructive",
});
@@ -72,10 +74,10 @@ const Account = () => {
name="email"
render={({ field }) => (
- 邮箱
+ {t('email')}
{
@@ -92,10 +94,10 @@ const Account = () => {
{changed ? (
-
+
) : (
)}
diff --git a/ui/src/pages/setting/Notify.tsx b/ui/src/pages/setting/Notify.tsx
index ecdec18..a727611 100644
--- a/ui/src/pages/setting/Notify.tsx
+++ b/ui/src/pages/setting/Notify.tsx
@@ -9,15 +9,18 @@ import {
AccordionTrigger,
} from "@/components/ui/accordion";
import { NotifyProvider } from "@/providers/notify";
+import { useTranslation } from "react-i18next";
const Notify = () => {
+ const { t } = useTranslation();
+
return (
<>
- 模板
+ {t('template')}
diff --git a/ui/src/pages/setting/Password.tsx b/ui/src/pages/setting/Password.tsx
index 8733a5c..c72b15c 100644
--- a/ui/src/pages/setting/Password.tsx
+++ b/ui/src/pages/setting/Password.tsx
@@ -14,29 +14,31 @@ import { getPb } from "@/repository/api";
import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
import { z } from "zod";
const formSchema = z
.object({
oldPassword: z.string().min(10, {
- message: "密码至少10个字符",
+ message: "setting.password.length.message",
}),
newPassword: z.string().min(10, {
- message: "密码至少10个字符",
+ message: "setting.password.length.message",
}),
confirmPassword: z.string().min(10, {
- message: "密码至少10个字符",
+ message: "setting.password.length.message",
}),
})
.refine((data) => data.newPassword === data.confirmPassword, {
- message: "两次密码不一致",
+ message: "setting.password.not.match",
path: ["confirmPassword"],
});
const Password = () => {
const { toast } = useToast();
const navigate = useNavigate();
+ const { t } = useTranslation();
const form = useForm>({
resolver: zodResolver(formSchema),
@@ -66,8 +68,8 @@ const Password = () => {
getPb().authStore.clear();
toast({
- title: "修改密码成功",
- description: "请重新登录",
+ title: t('setting.password.change.succeed'),
+ description: t("setting.account.log.back.in"),
});
setTimeout(() => {
navigate("/login");
@@ -75,7 +77,7 @@ const Password = () => {
} catch (e) {
const message = getErrMessage(e);
toast({
- title: "修改密码失败",
+ title: t('setting.password.change.failed'),
description: message,
variant: "destructive",
});
@@ -95,9 +97,9 @@ const Password = () => {
name="oldPassword"
render={({ field }) => (
- 当前密码
+ {t('setting.password.current.password')}
-
+
@@ -110,7 +112,7 @@ const Password = () => {
name="newPassword"
render={({ field }) => (
- 新密码
+ {t('setting.password.new.password')}
{
name="confirmPassword"
render={({ field }) => (
- 确认密码
+ {t('setting.password.confirm.password')}
{
)}
/>
-
+
From b3f1e1e444f18a93d68107112fb4f694d213ddd5 Mon Sep 17 00:00:00 2001
From: Elvis Liao
Date: Thu, 26 Sep 2024 19:47:50 +0800
Subject: [PATCH 3/8] chore: import i18n
---
ui/src/main.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/src/main.tsx b/ui/src/main.tsx
index 92acf52..6039f41 100644
--- a/ui/src/main.tsx
+++ b/ui/src/main.tsx
@@ -4,6 +4,7 @@ import "./global.css";
import { RouterProvider } from "react-router-dom";
import { router } from "./router.tsx";
import { ThemeProvider } from "./components/ThemeProvider.tsx";
+import "@/i18n";
ReactDOM.createRoot(document.getElementById("root")!).render(
From e820e5599bc289e910ed85a2a6f34708ea145bbf Mon Sep 17 00:00:00 2001
From: Elvis Liao
Date: Fri, 27 Sep 2024 00:42:40 +0800
Subject: [PATCH 4/8] wip: i18n
- Change locales json to one-dimensional format
---
ui/src/components/certimate/EmailsEdit.tsx | 14 +-
ui/src/components/certimate/Version.tsx | 5 +-
ui/src/i18n/locales/en.json | 103 +++++++++++-
ui/src/i18n/locales/zh.json | 172 +++++++++++----------
ui/src/pages/access/Access.tsx | 35 +++--
ui/src/pages/domains/Edit.tsx | 72 ++++-----
6 files changed, 259 insertions(+), 142 deletions(-)
diff --git a/ui/src/components/certimate/EmailsEdit.tsx b/ui/src/components/certimate/EmailsEdit.tsx
index d1d2fc9..6da10ea 100644
--- a/ui/src/components/certimate/EmailsEdit.tsx
+++ b/ui/src/components/certimate/EmailsEdit.tsx
@@ -10,6 +10,7 @@ import {
import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
import {
Form,
FormControl,
@@ -39,9 +40,10 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
} = useConfig();
const [open, setOpen] = useState(false);
+ const { t } = useTranslation();
const formSchema = z.object({
- email: z.string().email(),
+ email: z.string().email("email.valid.message"),
});
const form = useForm>({
@@ -54,7 +56,7 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
const onSubmit = async (data: z.infer) => {
if ((emails.content as EmailsSetting).emails.includes(data.email)) {
form.setError("email", {
- message: "邮箱已存在",
+ message: "email.already.exist",
});
return;
}
@@ -100,7 +102,7 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
- 添加邮箱
+ {t('email.add')}
@@ -118,9 +120,9 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
name="email"
render={({ field }) => (
- 邮箱
+ {t('email')}
-
+
@@ -129,7 +131,7 @@ const EmailsEdit = ({ className, trigger }: EmailsEditProps) => {
/>
-
+
diff --git a/ui/src/components/certimate/Version.tsx b/ui/src/components/certimate/Version.tsx
index 47bfa7c..997ab11 100644
--- a/ui/src/components/certimate/Version.tsx
+++ b/ui/src/components/certimate/Version.tsx
@@ -1,9 +1,12 @@
import { BookOpen } from "lucide-react";
+import { useTranslation } from "react-i18next";
import { Separator } from "../ui/separator";
import { version } from "@/domain/version";
const Version = () => {
+ const { t } = useTranslation()
+
return (
@@ -14,7 +17,7 @@ const Version = () => {
className="flex items-center"
>
-
文档
+
{t('document')}
部署历史 查看详情。",
- "empty": "请添加域名开始部署证书吧。",
- "expiry.date": "有效期限",
- "expiry.date1": "有效期 {{date}} 天",
- "expiry.date2": "{{date}} 到期",
- "last.execution.time": "最近执行时间",
- "last.execution.status": "最近执行状态",
- "last.execution.stage": "最近执行阶段",
- "enable": "是否启用",
- "start.deploying": "立即部署",
- "forced.deployment": "强行部署",
- "delete.confirm": "确定要删除域名吗？",
- "edit": {
- "title": "编辑域名",
- "domain.verify.tips": "域名",
- "dns.verify.tips": "请选择DNS服务商授权配置",
- "target.type.verify.tips": "请选择部署服务类型"
- }
- },
+ "domain.not.empty.verify.message": "请输入域名",
+ "domain.management.name": "域名列表",
+ "domain.management.start.deploy.succeed.tips": "已发起部署，请稍后查看部署日志。",
+ "domain.management.execution.failed": "执行失败",
+ "domain.management.execution.failed.tips": "执行失败，请在 <1>部署历史 查看详情。",
+ "domain.management.empty": "请添加域名开始部署证书吧。",
+ "domain.management.expiry.date": "有效期限",
+ "domain.management.expiry.date1": "有效期 {{date}} 天",
+ "domain.management.expiry.date2": "{{date}} 到期",
+ "domain.management.last.execution.time": "最近执行时间",
+ "domain.management.last.execution.status": "最近执行状态",
+ "domain.management.last.execution.stage": "最近执行阶段",
+ "domain.management.enable": "是否启用",
+ "domain.management.start.deploying": "立即部署",
+ "domain.management.forced.deployment": "强行部署",
+ "domain.management.delete.confirm": "确定要删除域名吗？",
+ "domain.management.edit.title": "编辑域名",
+ "domain.management.edit.dns.access.label": "DNS 服务商授权配置",
+ "domain.management.edit.dns.access.not.empty.message": "请选择DNS服务商授权配置",
+ "domain.management.edit.access.label": "服务商授权配置",
+ "domain.management.edit.access.not.empty.message": "请选择授权配置",
+ "domain.management.edit.target.type": "部署服务类型",
+ "domain.management.edit.target.type.not.empty.message": "请选择部署服务类型",
+ "domain.management.edit.succeed.tips": "域名编辑成功",
+ "domain.management.edit.target.access": "部署服务商授权配置",
+ "domain.management.edit.target.access.content.label": "服务商授权配置",
+ "domain.management.edit.target.access.not.empty.message": "请选择授权配置",
+ "domain.management.edit.target.access.verify.msg": "部署授权和部署授权组至少选一个",
+ "domain.management.edit.group.label": "部署配置组（用于将一个域名证书部署到多个 ssh 主机）",
+ "domain.management.edit.group.not.empty.message": "请选择分组",
+ "domain.management.edit.email.not.empty.message": "请选择邮箱",
+ "domain.management.edit.email.description": "（申请证书需要提供邮箱）",
+ "domain.management.edit.variables.placeholder": "可在SSH部署中使用,形如:\nkey=val;\nkey2=val2;",
+ "domain.management.edit.dns.placeholder": "自定义域名服务器,多个用分号隔开,如:\n8.8.8.8;\n8.8.4.4;",
+ "domain.management.add.succeed.tips": "域名添加成功",
+ "email.add": "添加邮箱",
+ "email.list": "邮箱列表",
+ "email.valid.message": "请输入正确的邮箱地址",
+ "email.already.exist": "邮箱已存在",
+ "email.not.empty.message": "请输入邮箱",
"setting.notify.menu": "消息推送",
"setting.submit": "确认修改",
- "setting.account.email": {
- "valid.message": "请输入正确的邮箱地址",
- "placeholder": "请输入邮箱",
- "change.succeed": "修改账户邮箱成功",
- "change.failed": "修改账户邮箱失败"
- },
+ "setting.account.email.valid.message": "请输入正确的邮箱地址",
+ "setting.account.email.placeholder": "请输入邮箱",
+ "setting.account.email.change.succeed": "修改账户邮箱成功",
+ "setting.account.email.change.failed": "修改账户邮箱失败",
"setting.account.log.back.in": "请重新登录",
- "setting.password": {
- "length.message": "密码至少10个字符",
- "not.match": "两次密码不一致",
- "change.succeed": "修改密码成功",
- "change.failed": "修改密码失败",
- "current.password": "当前密码",
- "new.password": "新密码",
- "confirm.password": "确认密码"
- },
- "setting.notify": {
- "template": {
- "save.succeed": "通知模板保存成功",
- "variables.tips": {
- "title": "可选的变量, COUNT:即将过期张数",
- "content": "可选的变量, COUNT:即将过期张数，DOMAINS:域名列表"
- }
- },
- "config": {
- "enable": "是否启用",
- "save.succeed": "配置保存成功",
- "save.failed": "配置保存失败",
- "save.failed.url.not.valid": "Url格式不正确"
- }
- },
- "deploy.progress": {
- "check": "检查",
- "apply": "获取",
- "deploy": "部署"
- }
+ "setting.password.length.message": "密码至少10个字符",
+ "setting.password.not.match": "两次密码不一致",
+ "setting.password.change.succeed": "修改密码成功",
+ "setting.password.change.failed": "修改密码失败",
+ "setting.password.current.password": "当前密码",
+ "setting.password.new.password": "新密码",
+ "setting.password.confirm.password": "确认密码",
+ "setting.notify.template.save.succeed": "通知模板保存成功",
+ "setting.notify.template.variables.tips.title": "可选的变量, COUNT:即将过期张数",
+ "setting.notify.template.variables.tips.content": "可选的变量, COUNT:即将过期张数，DOMAINS:域名列表",
+ "setting.notify.config.enable": "是否启用",
+ "setting.notify.config.save.succeed": "配置保存成功",
+ "setting.notify.config.save.failed": "配置保存失败",
+ "setting.notify.config.save.failed.url.not.valid": "Url格式不正确",
+ "deploy.progress.check": "检查",
+ "deploy.progress.apply": "获取",
+ "deploy.progress.deploy": "部署",
+ "access.management": "授权管理",
+ "access.add": "添加授权",
+ "access.list": "授权列表",
+ "access.type": "服务商",
+ "access.empty": "请添加授权开始部署证书吧。",
+ "access.group.management": "授权组管理",
+ "access.group.add": "添加授权组"
}
\ No newline at end of file
diff --git a/ui/src/pages/access/Access.tsx b/ui/src/pages/access/Access.tsx
index cbeb267..3f955f2 100644
--- a/ui/src/pages/access/Access.tsx
+++ b/ui/src/pages/access/Access.tsx
@@ -9,6 +9,7 @@ import { Access as AccessType, accessTypeMap } from "@/domain/access";
import { convertZulu2Beijing } from "@/lib/time";
import { useConfig } from "@/providers/config";
import { remove } from "@/repository/access";
+import { t } from "i18next";
import { Key } from "lucide-react";
import { useLocation, useNavigate } from "react-router-dom";
@@ -46,11 +47,11 @@ const Access = () => {
return (
-
授权管理
+
{t('access.management')}
{tab != "access_group" ? (
-
添加授权} op="add" />
+ {t('access.add')}} op="add" />
) : (
- 添加授权组} />
+ {t('access.group.add')}} />
)}
@@ -66,7 +67,7 @@ const Access = () => {
handleTabItemClick("access");
}}
>
- 授权管理
+ {t('access.management')}
{
handleTabItemClick("access_group");
}}
>
- 授权组管理
+ {t('access.group.management')}
@@ -85,10 +86,10 @@ const Access = () => {
- 请添加授权开始部署证书吧。
+ {t('access.empty')}
添加授权}
+ trigger={}
op="add"
className="mt-3"
/>
@@ -96,15 +97,15 @@ const Access = () => {
) : (
<>
-
名称
-
服务商
+
{t('name')}
+
{t('access.type')}
-
创建时间
-
更新时间
-
操作
+
{t('create.time')}
+
{t('update.time')}
+
{t('operation')}
- 授权列表
+ {t('access.list')}
{accesses
.filter((item) => {
@@ -128,18 +129,18 @@ const Access = () => {
- 创建于{" "}
+ {t('created.in')}{" "}
{access.created && convertZulu2Beijing(access.created)}
- 更新于{" "}
+ {t('updated.in')}{" "}
{access.updated && convertZulu2Beijing(access.updated)}
- 编辑
+ {t('edit')}
}
op="edit"
@@ -153,7 +154,7 @@ const Access = () => {
handleDelete(access);
}}
>
- 删除
+ {t('delete')}
diff --git a/ui/src/pages/domains/Edit.tsx b/ui/src/pages/domains/Edit.tsx
index 3a4c423..771b96b 100644
--- a/ui/src/pages/domains/Edit.tsx
+++ b/ui/src/pages/domains/Edit.tsx
@@ -71,15 +71,15 @@ const Edit = () => {
const formSchema = z.object({
id: z.string().optional(),
domain: z.string().regex(/^(?:\*\.)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}$/, {
- message: t('domain.management.edit.domain.verify.tips'),
+ message: 'domain.not.empty.verify.message',
}),
- email: z.string().email().optional(),
+ email: z.string().email('email.valid.message').optional(),
access: z.string().regex(/^[a-zA-Z0-9]+$/, {
- message: t('domain.management.edit.dns.verify.tips'),
+ message: 'domain.management.edit.dns.access.not.empty.message',
}),
targetAccess: z.string().optional(),
targetType: z.string().regex(/^[a-zA-Z0-9-]+$/, {
- message: t('domain.management.edit.target.type.verify.tips'),
+ message: 'domain.management.edit.target.type.not.empty.message',
}),
variables: z.string().optional(),
group: z.string().optional(),
@@ -140,11 +140,11 @@ const Edit = () => {
if (group == "" && targetAccess == "") {
form.setError("group", {
type: "manual",
- message: "部署授权和部署授权组至少选一个",
+ message: 'domain.management.edit.target.access.verify.msg',
});
form.setError("targetAccess", {
type: "manual",
- message: "部署授权和部署授权组至少选一个",
+ message: 'domain.management.edit.target.access.verify.msg',
});
return;
}
@@ -164,13 +164,13 @@ const Edit = () => {
try {
await save(req);
- let description = "域名编辑成功";
+ let description = t('domain.management.edit.succeed.tips');
if (req.id == "") {
- description = "域名添加成功";
+ description = t('domain.management.add.succeed.tips');
}
toast({
- title: "成功",
+ title: t('succeed'),
description,
});
navigate("/domains");
@@ -195,7 +195,7 @@ const Edit = () => {
- {domain?.id ? "编辑" : "新增"}域名
+ {domain?.id ? t('domain.edit') : t('domain.add')}
@@ -208,7 +208,7 @@ const Edit = () => {
setTab("base");
}}
>
- 基础设置
+ {t('basic.setting')}
{
setTab("advance");
}}
>
- 高级设置
+ {t('advanced.setting')}
@@ -234,9 +234,9 @@ const Edit = () => {
name="domain"
render={({ field }) => (
- 域名
+ {t('domain')}
-
+
@@ -249,12 +249,12 @@ const Edit = () => {
render={({ field }) => (
- Email（申请证书需要提供邮箱）
+ {t('email') + t('domain.management.edit.email.description')}
- 新增
+ {t('add')}
}
/>
@@ -268,11 +268,11 @@ const Edit = () => {
}}
>
-
+
- 邮箱列表
+ {t('email.list')}
{(emails.content as EmailsSetting).emails.map(
(item) => (
@@ -295,12 +295,12 @@ const Edit = () => {
render={({ field }) => (
- DNS 服务商授权配置
+ {t('domain.management.edit.dns.access.label')}
- 新增
+ {t('add')}
@@ -151,7 +149,7 @@ const AccessGroupList = () => {
);
}}
>
- 所有授权
+ {t('access.all')}
@@ -175,21 +173,21 @@ const AccessGroupList = () => {
- 删除组
+ {t('access.group.delete')}
- 确定要删除部署授权组吗？
+ {t('access.group.delete.confirm')}
- 取消
+ {t('cancel')}
{
@@ -198,7 +196,7 @@ const AccessGroupList = () => {
);
}}
>
- 确认
+ {t('confirm')}
diff --git a/ui/src/components/certimate/AccessNamesiloForm.tsx b/ui/src/components/certimate/AccessNamesiloForm.tsx
index ac2abe1..d70d57b 100644
--- a/ui/src/components/certimate/AccessNamesiloForm.tsx
+++ b/ui/src/components/certimate/AccessNamesiloForm.tsx
@@ -1,5 +1,6 @@
import { Input } from "@/components/ui/input";
import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
import { zodResolver } from "@hookform/resolvers/zod";
@@ -28,11 +29,12 @@ const AccessNamesiloForm = ({
onAfterReq: () => void;
}) => {
const { addAccess, updateAccess } = useConfig();
+ const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
- name: z.string().min(1).max(64),
+ name: z.string().min(1, 'access.form.name.not.empty').max(64, t('zod.rule.string.max', { max: 64 })),
configType: accessFormType,
- apiKey: z.string().min(1).max(64),
+ apiKey: z.string().min(1, 'access.form.namesilo.api.key.not.empty').max(64, t('zod.rule.string.max', { max: 64 })),
});
let config: NamesiloConfig = {
@@ -44,14 +46,13 @@ const AccessNamesiloForm = ({
resolver: zodResolver(formSchema),
defaultValues: {
id: data?.id,
- name: data?.name,
+ name: data?.name || '',
configType: "namesilo",
apiKey: config.apiKey,
},
});
const onSubmit = async (data: z.infer) => {
- console.log(data);
const req: Access = {
id: data.id as string,
name: data.name,
@@ -106,9 +107,9 @@ const AccessNamesiloForm = ({
name="name"
render={({ field }) => (
- 名称
+ {t('name')}
-
+
@@ -121,7 +122,7 @@ const AccessNamesiloForm = ({
name="id"
render={({ field }) => (
- 配置类型
+ {t('access.form.config.field')}
@@ -136,7 +137,7 @@ const AccessNamesiloForm = ({
name="configType"
render={({ field }) => (
- 配置类型
+ {t('access.form.config.field')}
@@ -151,9 +152,9 @@ const AccessNamesiloForm = ({
name="apiKey"
render={({ field }) => (
- NAMESILO_API_KEY
+ {t('access.form.namesilo.api.key')}
-
+
@@ -162,7 +163,7 @@ const AccessNamesiloForm = ({
/>
-
+
diff --git a/ui/src/components/certimate/AccessQiniuForm.tsx b/ui/src/components/certimate/AccessQiniuForm.tsx
index 7b58f07..125f7ae 100644
--- a/ui/src/components/certimate/AccessQiniuForm.tsx
+++ b/ui/src/components/certimate/AccessQiniuForm.tsx
@@ -1,5 +1,6 @@
import { Input } from "@/components/ui/input";
import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
import { zodResolver } from "@hookform/resolvers/zod";
@@ -29,12 +30,13 @@ const AccessQiniuForm = ({
onAfterReq: () => void;
}) => {
const { addAccess, updateAccess } = useConfig();
+ const { t } = useTranslation();
const formSchema = z.object({
id: z.string().optional(),
- name: z.string().min(1).max(64),
+ name: z.string().min(1, 'access.form.name.not.empty').max(64, t('zod.rule.string.max', { max: 64 })),
configType: accessFormType,
- accessKey: z.string().min(1).max(64),
- secretKey: z.string().min(1).max(64),
+ accessKey: z.string().min(1, 'access.form.access.key.not.empty').max(64),
+ secretKey: z.string().min(1, 'access.form.secret.key.not.empty').max(64),
});
let config: QiniuConfig = {
@@ -47,7 +49,7 @@ const AccessQiniuForm = ({
resolver: zodResolver(formSchema),
defaultValues: {
id: data?.id,
- name: data?.name,
+ name: data?.name || '',
configType: "qiniu",
accessKey: config.accessKey,
secretKey: config.secretKey,
@@ -111,9 +113,9 @@ const AccessQiniuForm = ({
name="name"
render={({ field }) => (
- 名称
+ {t('name')}
-
+
@@ -126,7 +128,7 @@ const AccessQiniuForm = ({
name="id"
render={({ field }) => (
- 配置类型
+ {t('access.form.config.field')}
@@ -141,7 +143,7 @@ const AccessQiniuForm = ({
name="configType"
render={({ field }) => (
- 配置类型
+ {t('access.form.config.field')}
@@ -156,9 +158,9 @@ const AccessQiniuForm = ({
name="accessKey"
render={({ field }) => (
- AccessKey
+ {t('access.form.access.key')}
-
+
@@ -171,9 +173,9 @@ const AccessQiniuForm = ({
name="secretKey"
render={({ field }) => (
- SecretKey
+ {t('access.form.secret.key')}
-
+
@@ -184,7 +186,7 @@ const AccessQiniuForm = ({
-
+
diff --git a/ui/src/components/certimate/AccessSSHForm.tsx b/ui/src/components/certimate/AccessSSHForm.tsx
index b7af5b4..5e4696f 100644
--- a/ui/src/components/certimate/AccessSSHForm.tsx
+++ b/ui/src/components/certimate/AccessSSHForm.tsx
@@ -24,6 +24,7 @@ import { ClientResponseError } from "pocketbase";
import { PbErrorData } from "@/domain/base";
import { readFileContent } from "@/lib/file";
import { useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
import {
Select,
SelectContent,
@@ -53,6 +54,7 @@ const AccessSSHForm = ({
const fileInputRef = useRef(null);
const [fileName, setFileName] = useState("");
+ const { t } = useTranslation();
const originGroup = data ? (data.group ? data.group : "") : "";
@@ -62,25 +64,25 @@ const AccessSSHForm = ({
const formSchema = z.object({
id: z.string().optional(),
- name: z.string().min(1).max(64),
+ name: z.string().min(1, 'access.form.name.not.empty').max(64, t('zod.rule.string.max', { max: 64 })),
configType: accessFormType,
host: z.string().refine(
(str) => {
return ipReg.test(str) || domainReg.test(str);
},
{
- message: "请输入正确的域名或IP",
+ message: "zod.rule.ssh.host",
}
),
group: z.string().optional(),
- port: z.string().min(1).max(5),
- username: z.string().min(1).max(64),
- password: z.string().min(0).max(64),
- key: z.string().min(0).max(20480),
+ port: z.string().min(1, 'access.form.ssh.port.not.empty').max(5, t('zod.rule.string.max', { max: 5 })),
+ username: z.string().min(1, 'username.not.empty').max(64, t('zod.rule.string.max', { max: 64 })),
+ password: z.string().min(0, 'password.not.empty').max(64, t('zod.rule.string.max', { max: 64 })),
+ key: z.string().min(0, 'access.form.ssh.key.not.empty').max(20480, t('zod.rule.string.max', { max: 20480 })),
keyFile: z.any().optional(),
- command: z.string().min(1).max(2048),
- certPath: z.string().min(0).max(2048),
- keyPath: z.string().min(0).max(2048),
+ command: z.string().min(1, 'access.form.ssh.command.not.empty').max(2048, t('zod.rule.string.max', { max: 2048 })),
+ certPath: z.string().min(0, 'access.form.ssh.cert.path.not.empty').max(2048, t('zod.rule.string.max', { max: 2048 })),
+ keyPath: z.string().min(0, 'access.form.ssh.key.path.not.empty').max(2048, t('zod.rule.string.max', { max: 2048 })),
});
let config: SSHConfig = {
@@ -100,7 +102,7 @@ const AccessSSHForm = ({
resolver: zodResolver(formSchema),
defaultValues: {
id: data?.id,
- name: data?.name,
+ name: data?.name || '',
configType: "ssh",
group: data?.group,
host: config.host,
@@ -219,9 +221,9 @@ const AccessSSHForm = ({
name="name"
render={({ field }) => (
- 名称
+ {t('name')}
-
+
@@ -235,12 +237,12 @@ const AccessSSHForm = ({
render={({ field }) => (
- 授权配置组(用于将一个域名证书部署到多个 ssh 主机)
+ {t('access.form.ssh.group.label')}
- 新增
+ {t('add')}