translations

sinamics · Dec 3, 2023 · fd4378e · fd4378e
1 parent a549bf9
commit fd4378e
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 64 deletions.
diff --git a/src/components/adminPage/users/table/accounts.tsx b/src/components/adminPage/users/table/accounts.tsx
@@ -38,7 +38,9 @@ export const Accounts = () => {
 		{ id: "id", desc: true },
 	]);
 
+	const ct = useTranslations("commonTable");
 	const t = useTranslations("admin");
+
 	const [globalFilter, setGlobalFilter] = useState("");
 	const { callModal } = useModalStore((state) => state);
 	const [sorting, setSorting] = useState<SortingState>(initialSortingState);
@@ -56,15 +58,15 @@ export const Accounts = () => {
 			// 	minSize: 70,
 			// }),
 			columnHelper.accessor("name", {
-				header: () => <span>{t("users.users.table.memberName")}</span>,
+				header: () => <span>{ct("header.name")}</span>,
 				id: "name",
 				minSize: 350,
 				cell: ({ getValue }) => {
 					return getValue();
 				},
 			}),
 			columnHelper.accessor("email", {
-				header: () => <span>{t("users.users.table.email")}</span>,
+				header: () => <span>{ct("header.email")}</span>,
 				id: "email",
 			}),
 			// columnHelper.accessor("emailVerified", {
@@ -80,39 +82,39 @@ export const Accounts = () => {
 			// 	},
 			// }),
 			columnHelper.accessor((row: ExtendedUser) => row._count?.network, {
-				header: () => <span>{t("users.users.table.networks")}</span>,
+				header: () => <span>{ct("header.networks")}</span>,
 				id: "Networks",
 				minSize: 20,
 				cell: ({ getValue }) => {
 					return getValue();
 				},
 			}),
 			columnHelper.accessor("userGroupId", {
-				header: () => <span>{t("users.users.table.group")}</span>,
+				header: () => <span>{ct("header.group")}</span>,
 				id: "group",
 				minSize: 80,
 				cell: ({ row: { original: { userGroup } } }) => {
 					return userGroup?.name ?? "None";
 				},
 			}),
 			columnHelper.accessor("isActive", {
-				header: () => <span>Account</span>,
+				header: () => <span>{ct("header.account")}</span>,
 				id: "isActive",
 				minSize: 80,
 				cell: ({ getValue }) => {
 					return getValue() ? "Active" : "Disabled";
 				},
 			}),
 			columnHelper.accessor("role", {
-				header: () => <span>{t("users.users.table.role")}</span>,
+				header: () => <span>{ct("header.role")}</span>,
 				id: "role",
 				minSize: 80,
 				cell: ({ getValue }) => {
 					return getValue();
 				},
 			}),
 			columnHelper.accessor("action", {
-				header: () => <span>Actions</span>,
+				header: () => <span>{ct("header.actions")}</span>,
 				id: "action",
 				cell: ({ row: { original } }) => {
 					return (

diff --git a/src/components/adminPage/users/userInvitation.tsx b/src/components/adminPage/users/userInvitation.tsx
@@ -168,7 +168,7 @@ const UserInvitationLink = () => {
 				rootFormClassName="flex flex-col space-y-2 w-6/6"
 				size="sm"
 				placeholder=""
-				buttonText={t("buttons.generate")}
+				buttonText={t("commonButtons.generate")}
 				fields={[
 					{
 						name: "secret",

diff --git a/src/components/networkByIdPage/table/memberEditCell.tsx b/src/components/networkByIdPage/table/memberEditCell.tsx
@@ -187,8 +187,10 @@ const MemberEditCell = ({ nwid, central = false, organizationId }: IProp) => {
 				};
 				return (
 					<div className="space-y-1">
-						{generateClipboardElement(hasRfc4193, rfc4193Ip)}
-						{generateClipboardElement(has6plane, sixPlaneIp)}
+						<div className="text-left">
+							{generateClipboardElement(hasRfc4193, rfc4193Ip)}
+							{generateClipboardElement(has6plane, sixPlaneIp)}
+						</div>
 
 						{original?.ipAssignments?.map((assignedIp) => {
 							const subnetMatch = isIPInSubnet(assignedIp, networkById.network?.routes);

diff --git a/src/components/networkPage/networkTable.tsx b/src/components/networkPage/networkTable.tsx
@@ -38,7 +38,7 @@ const TruncateText = ({ text }: { text: string }) => {
 };
 export const NetworkTable = ({ tableData = [] }) => {
 	const router = useRouter();
-	const t = useTranslations("networksTable");
+	const t = useTranslations("commonTable");
 
 	// Load initial state from localStorage or set to default
 	const initialSortingState = getLocalStorageItem(LOCAL_STORAGE_KEY, [
@@ -60,20 +60,20 @@ export const NetworkTable = ({ tableData = [] }) => {
 		() => [
 			columnHelper.accessor("name", {
 				cell: (info) => info.getValue(),
-				header: () => <span>{t("name")}</span>,
+				header: () => <span>{t("header.name")}</span>,
 			}),
 			columnHelper.accessor("description", {
 				size: 300,
 				cell: (info) => <TruncateText text={info.getValue()} />,
-				header: () => <span>{t("description")}</span>,
+				header: () => <span>{t("header.description")}</span>,
 			}),
 			columnHelper.accessor("nwid", {
 				cell: (info) => info.getValue(),
-				header: () => <span>{t("networkId")}</span>,
+				header: () => <span>{t("header.networkId")}</span>,
 				// footer: (info) => info.column.id,
 			}),
 			columnHelper.accessor("members", {
-				header: () => <span>{t("members")}</span>,
+				header: () => <span>{t("header.members")}</span>,
 				cell: ({ row: { original } }) => {
 					if (!Array.isArray(original.networkMembers)) return <span>0</span>;
 					return <span>{original.networkMembers.length}</span>;
@@ -140,7 +140,7 @@ export const NetworkTable = ({ tableData = [] }) => {
 					value={globalFilter ?? ""}
 					onChange={(value) => setGlobalFilter(String(value))}
 					className="font-lg border-block border p-2 shadow"
-					placeholder={t("networkSearchPlaceholder")}
+					placeholder={t("search.networkSearchPlaceholder")}
 				/>
 			</div>
 			<div className="overflow-auto rounded-lg border border-base-200/50">

diff --git a/src/locales/en/common.json b/src/locales/en/common.json
@@ -34,6 +34,9 @@
 			"authorized": "Auth",
 			"id": "ID",
 			"created": "Created",
+			"networks": "Networks",
+			"group": "Group",
+			"account": "Account",
 			"ipAssignments": {
 				"header": "Managed IP / Latency",
 				"notAssigned": "Not Assigned"
@@ -314,6 +317,7 @@
 			"inviteUserTemplate": "Invite user template",
 			"forgotPasswordTemplate": "Forgot Password template",
 			"notificationTemplate": "Notification template",
+			"organizationInviteTemplate": "Organization Invite template",
 			"templates": {
 				"availableTags": "Available tags:",
 				"subject": "Subject",
@@ -357,17 +361,6 @@
 			"users": {
 				"sectionTitle": "Users",
 				"description": "All registered users on the platform.",
-				"table": {
-					"id": "ID",
-					"memberName": "Member name",
-					"email": "Email",
-					"emailVerified": "Email Verified",
-					"role": "Role",
-					"networks": "Networks",
-					"group": "Group",
-					"emailVerifiedYes": "Yes",
-					"emailVerifiedNo": "No"
-				},
 				"userOptionModal": {
 					"userGroupLabel": "User Group",
 					"userRoleLabel": "User Role",

diff --git a/src/locales/es/common.json b/src/locales/es/common.json
@@ -34,6 +34,9 @@
 			"authorized": "Auth",
 			"id": "ID",
 			"created": "Creado",
+			"networks": "Redes",
+			"group": "Grupo",
+			"account": "Cuenta",
 			"ipAssignments": {
 				"header": "IP Administrada / Latencia",
 				"notAssigned": "No Asignado"
@@ -48,7 +51,7 @@
 				"relayed": "RETRANSMITIDO",
 				"directLan": "Conexión LAN directa establecida",
 				"directWan": "Conexión WAN directa establecida",
-				"direct": "DIRECTO{versión}",
+				"direct": "DIRECTO{version}",
 				"offline": "desconectado"
 			},
 			"status": "Estado"
@@ -314,6 +317,7 @@
 			"inviteUserTemplate": "Plantilla de invitación de usuario",
 			"forgotPasswordTemplate": "Plantilla de contraseña olvidada",
 			"notificationTemplate": "Plantilla de notificación",
+			"organizationInviteTemplate": "Plantilla de invitación de organización",
 			"templates": {
 				"availableTags": "Etiquetas disponibles:",
 				"subject": "Asunto",
@@ -357,17 +361,6 @@
 			"users": {
 				"sectionTitle": "Usuarios",
 				"description": "Todos los usuarios registrados en la plataforma.",
-				"table": {
-					"id": "ID",
-					"memberName": "Nombre del miembro",
-					"email": "Correo electrónico",
-					"emailVerified": "Correo verificado",
-					"role": "Rol",
-					"networks": "Redes",
-					"group": "Grupo",
-					"emailVerifiedYes": "Sí",
-					"emailVerifiedNo": "No"
-				},
 				"userOptionModal": {
 					"userGroupLabel": "Grupo de usuarios",
 					"userRoleLabel": "Rol de usuario",

diff --git a/src/locales/no/common.json b/src/locales/no/common.json
@@ -34,6 +34,9 @@
 			"authorized": "Aut.",
 			"id": "ID",
 			"created": "Opprettet",
+			"networks": "Nettverk",
+			"group": "Gruppe",
+			"account": "Konto",
 			"ipAssignments": {
 				"header": "Administrert IP / Latens",
 				"notAssigned": "Ikke Tildelt"
@@ -48,7 +51,7 @@
 				"relayed": "VIDERESENDT",
 				"directLan": "Direkte LAN-forbindelse etablert",
 				"directWan": "Direkte WAN-forbindelse etablert",
-				"direct": "DIREKTE{versjon}",
+				"direct": "DIREKTE{version}",
 				"offline": "frakoblet"
 			},
 			"status": "Status"
@@ -314,6 +317,7 @@
 			"inviteUserTemplate": "Inviter bruker mal",
 			"forgotPasswordTemplate": "Glemt passord mal",
 			"notificationTemplate": "Varslings mal",
+			"organizationInviteTemplate": "Organisasjonsinvitasjonsmal",
 			"templates": {
 				"availableTags": "Tilgjengelige merker:",
 				"subject": "Emne",
@@ -357,17 +361,6 @@
 			"users": {
 				"sectionTitle": "Brukere",
 				"description": "Alle registrerte brukere på plattformen.",
-				"table": {
-					"id": "ID",
-					"memberName": "Medlemsnavn",
-					"email": "E-post",
-					"emailVerified": "E-post bekreftet",
-					"role": "Rolle",
-					"networks": "Nettverk",
-					"group": "Gruppe",
-					"emailVerifiedYes": "Ja",
-					"emailVerifiedNo": "Nei"
-				},
 				"userOptionModal": {
 					"userGroupLabel": "Brukergruppe",
 					"userRoleLabel": "Brukerrolle",

diff --git a/src/locales/zh/common.json b/src/locales/zh/common.json
@@ -34,6 +34,9 @@
 			"authorized": "授权",
 			"id": "ID",
 			"created": "创建时间",
+			"networks": "网络",
+			"group": "组",
+			"account": "账户",
 			"ipAssignments": {
 				"header": "管理的IP / 延迟",
 				"notAssigned": "未分配"
@@ -48,7 +51,7 @@
 				"relayed": "中继",
 				"directLan": "已建立直接LAN连接",
 				"directWan": "已建立直接WAN连接",
-				"direct": "直接连接{版本}",
+				"direct": "直接连接{version}",
 				"offline": "离线"
 			},
 			"status": "状态"
@@ -314,6 +317,7 @@
 			"inviteUserTemplate": "邀请用户模板",
 			"forgotPasswordTemplate": "忘记密码模板",
 			"notificationTemplate": "通知模板",
+			"organizationInviteTemplate": "组织邀请模板",
 			"templates": {
 				"availableTags": "可用的标签：",
 				"subject": "主题",
@@ -357,17 +361,6 @@
 			"users": {
 				"sectionTitle": "用户",
 				"description": "平台上的所有已注册用户。",
-				"table": {
-					"id": "ID",
-					"memberName": "成员名称",
-					"email": "电子邮件",
-					"emailVerified": "电子邮件已验证",
-					"role": "角色",
-					"networks": "网络",
-					"group": "组",
-					"emailVerifiedYes": "是",
-					"emailVerifiedNo": "否"
-				},
 				"userOptionModal": {
 					"userGroupLabel": "用户组",
 					"userRoleLabel": "用户角色",

diff --git a/src/pages/admin/mail/index.tsx b/src/pages/admin/mail/index.tsx
@@ -169,7 +169,7 @@ const Mail = () => {
 				</div>
 				<div className="collapse-arrow collapse w-full border border-base-300 bg-base-200">
 					<input type="checkbox" />
-					<div className="collapse-title">Organization Invite</div>
+					<div className="collapse-title">{t("mail.organizationInviteTemplate")}</div>
 					<div className="collapse-content" style={{ width: "100%" }}>
 						<OrganizationInviteTemplate />
 					</div>