update all

src/app/[orgId]/settings/sites/CreateSiteForm.tsx

@@ -50,26 +50,7 @@ import {
     CollapsibleTrigger
 } from "@app/components/ui/collapsible";
 import LoaderPlaceholder from "@app/components/PlaceHolderLoader";
-import { useTranslations } from 'next-intl';
-
-const createSiteFormSchema = z.object({
-    name: z
-        .string()
-        .min(2, {
-            message: "Name must be at least 2 characters."
-        })
-        .max(30, {
-            message: "Name must not be longer than 30 characters."
-        }),
-    method: z.enum(["wireguard", "newt", "local"])
-});
-
-type CreateSiteFormValues = z.infer<typeof createSiteFormSchema>;
-
-const defaultValues: Partial<CreateSiteFormValues> = {
-    name: "",
-    method: "newt"
-};
+import { useTranslations } from "next-intl";
 
 type CreateSiteFormProps = {
     onCreate?: (site: SiteRow) => void;
@@ -97,6 +78,25 @@ export default function CreateSiteForm({
         privateKey: string;
     } | null>(null);
 
+    const createSiteFormSchema = z.object({
+        name: z
+            .string()
+            .min(2, {
+                message: t('nameMin', {len: 2})
+            })
+            .max(30, {
+                message: t('nameMax', {len: 30})
+            }),
+        method: z.enum(["wireguard", "newt", "local"])
+    });
+
+    type CreateSiteFormValues = z.infer<typeof createSiteFormSchema>;
+
+    const defaultValues: Partial<CreateSiteFormValues> = {
+        name: "",
+        method: "newt"
+    };
+
     const [siteDefaults, setSiteDefaults] =
         useState<PickSiteDefaultsResponse | null>(null);
 

src/app/[orgId]/settings/sites/CreateSiteModal.tsx

@@ -14,7 +14,7 @@ import {
 } from "@app/components/Credenza";
 import { SiteRow } from "./SitesTable";
 import CreateSiteForm from "./CreateSiteForm";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 type CreateSiteFormProps = {
     open: boolean;

src/app/[orgId]/settings/sites/SitesDataTable.tsx

@@ -2,7 +2,7 @@
 
 import { ColumnDef } from "@tanstack/react-table";
 import { DataTable } from "@app/components/ui/data-table";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 interface DataTableProps<TData, TValue> {
     columns: ColumnDef<TData, TValue>[];

src/app/[orgId]/settings/sites/SitesTable.tsx

@@ -27,7 +27,7 @@ import { formatAxiosError } from "@app/lib/api";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import CreateSiteFormModal from "./CreateSiteModal";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 export type SiteRow = {
     id: number;

src/app/[orgId]/settings/sites/[niceId]/SiteInfoCard.tsx

@@ -9,7 +9,7 @@ import {
     InfoSections,
     InfoSectionTitle
 } from "@app/components/InfoSection";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 type SiteInfoCardProps = {};
 

src/app/[orgId]/settings/sites/[niceId]/general/page.tsx

@@ -31,13 +31,7 @@ import { formatAxiosError } from "@app/lib/api";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useState } from "react";
-import { useTranslations } from 'next-intl';
-
-const GeneralFormSchema = z.object({
-    name: z.string().nonempty("Name is required")
-});
-
-type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
+import { useTranslations } from "next-intl";
 
 export default function GeneralPage() {
     const { site, updateSite } = useSiteContext();
@@ -47,6 +41,13 @@ export default function GeneralPage() {
     const [loading, setLoading] = useState(false);
 
     const router = useRouter();
+    const t = useTranslations();
+
+    const GeneralFormSchema = z.object({
+        name: z.string().nonempty(t('nameRequired'))
+    });
+
+    type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
 
     const form = useForm<GeneralFormValues>({
         resolver: zodResolver(GeneralFormSchema),
@@ -55,7 +56,6 @@ export default function GeneralPage() {
         },
         mode: "onChange"
     });
-    const t = useTranslations();
 
     async function onSubmit(data: GeneralFormValues) {
         setLoading(true);

src/app/[orgId]/settings/sites/[niceId]/layout.tsx

@@ -16,7 +16,7 @@ import {
     BreadcrumbSeparator
 } from "@app/components/ui/breadcrumb";
 import SiteInfoCard from "./SiteInfoCard";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 interface SettingsLayoutProps {
     children: React.ReactNode;

src/app/[orgId]/settings/sites/create/page.tsx

@@ -64,33 +64,7 @@ import {
 } from "@app/components/ui/breadcrumb";
 import Link from "next/link";
 import { QRCodeCanvas } from "qrcode.react";
-import { useTranslations } from 'next-intl';
-
-const createSiteFormSchema = z
-    .object({
-        name: z
-            .string()
-            .min(2, "Name must be at least 2 characters.")
-            .max(30, {
-                message: "Name must not be longer than 30 characters."
-            }),
-        method: z.enum(["newt", "wireguard", "local"]),
-        copied: z.boolean()
-    })
-    .refine(
-        (data) => {
-            if (data.method !== "local") {
-                return data.copied;
-            }
-            return true;
-        },
-        {
-            message: "Please confirm that you have copied the config.",
-            path: ["copied"]
-        }
-    );
-
-type CreateSiteFormValues = z.infer<typeof createSiteFormSchema>;
+import { useTranslations } from "next-intl";
 
 type SiteType = "newt" | "wireguard" | "local";
 
@@ -127,6 +101,32 @@ export default function Page() {
     const router = useRouter();
     const t = useTranslations();
 
+    const createSiteFormSchema = z
+        .object({
+            name: z
+                .string()
+                .min(2, { message: t('nameMin', {len: 2}) })
+                .max(30, {
+                    message: t('nameMax', {len: 30})
+                }),
+            method: z.enum(["newt", "wireguard", "local"]),
+            copied: z.boolean()
+        })
+        .refine(
+            (data) => {
+                if (data.method !== "local") {
+                    return data.copied;
+                }
+                return true;
+            },
+            {
+                message: t('sitesConfirmCopy'),
+                path: ["copied"]
+            }
+        );
+
+    type CreateSiteFormValues = z.infer<typeof createSiteFormSchema>;
+
     const [tunnelTypes, setTunnelTypes] = useState<
         ReadonlyArray<TunnelTypeOption>
     >([

src/app/[orgId]/settings/sites/page.tsx

@@ -5,7 +5,7 @@ import { AxiosResponse } from "axios";
 import SitesTable, { SiteRow } from "./SitesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import SitesSplashCard from "./SitesSplashCard";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 type SitesPageProps = {
     params: Promise<{ orgId: string }>;