update all

src/app/admin/api-keys/[apiKeyId]/layout.tsx

@@ -15,7 +15,7 @@ import {
 import { GetApiKeyResponse } from "@server/routers/apiKeys";
 import ApiKeyProvider from "@app/providers/ApiKeyProvider";
 import { HorizontalTabs } from "@app/components/HorizontalTabs";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 interface SettingsLayoutProps {
     children: React.ReactNode;

src/app/admin/api-keys/create/page.tsx

@@ -56,35 +56,6 @@ import CopyTextBox from "@app/components/CopyTextBox";
 import PermissionsSelectBox from "@app/components/PermissionsSelectBox";
 import { useTranslations } from "next-intl";
 
-const createFormSchema = z.object({
-    name: z
-        .string()
-        .min(2, {
-            message: "Name must be at least 2 characters."
-        })
-        .max(255, {
-            message: "Name must not be longer than 255 characters."
-        })
-});
-
-type CreateFormValues = z.infer<typeof createFormSchema>;
-
-const copiedFormSchema = z
-    .object({
-        copied: z.boolean()
-    })
-    .refine(
-        (data) => {
-            return data.copied;
-        },
-        {
-            message: "You must confirm that you have copied the API key.",
-            path: ["copied"]
-        }
-    );
-
-type CopiedFormValues = z.infer<typeof copiedFormSchema>;
-
 export default function Page() {
     const { env } = useEnvContext();
     const api = createApiClient({ env });
@@ -98,6 +69,35 @@ export default function Page() {
         Record<string, boolean>
     >({});
 
+    const createFormSchema = z.object({
+        name: z
+            .string()
+            .min(2, {
+                message: t('nameMin', {len: 2})
+            })
+            .max(255, {
+                message: t('nameMax', {len: 255})
+            })
+    });
+
+    type CreateFormValues = z.infer<typeof createFormSchema>;
+
+    const copiedFormSchema = z
+        .object({
+            copied: z.boolean()
+        })
+        .refine(
+            (data) => {
+                return data.copied;
+            },
+            {
+                message: t('apiKeysConfirmCopy2'),
+                path: ["copied"]
+            }
+        );
+
+    type CopiedFormValues = z.infer<typeof copiedFormSchema>;
+
     const form = useForm<CreateFormValues>({
         resolver: zodResolver(createFormSchema),
         defaultValues: {

src/app/admin/api-keys/page.tsx

@@ -4,7 +4,7 @@ import { AxiosResponse } from "axios";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { ListRootApiKeysResponse } from "@server/routers/apiKeys";
 import ApiKeysTable, { ApiKeyRow } from "./ApiKeysTable";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 type ApiKeyPageProps = {};
 

src/app/admin/idp/AdminIdpTable.tsx

@@ -60,7 +60,7 @@ export default function IdpTable({ idps }: Props) {
     const getTypeDisplay = (type: string) => {
         switch (type) {
             case "oidc":
-                return t('idpOidc');
+                return "OAuth2/OIDC";
             default:
                 return type;
         }

src/app/admin/idp/[idpId]/general/page.tsx

@@ -45,23 +45,6 @@ import { Badge } from "@app/components/ui/badge";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { useTranslations } from "next-intl";
 
-const GeneralFormSchema = z.object({
-    name: z.string().min(2, "Name must be at least 2 characters."),
-    clientId: z.string().min(1, { message: "Client ID is required." }),
-    clientSecret: z.string().min(1, { message: "Client Secret is required." }),
-    authUrl: z.string().url({ message: "Auth URL must be a valid URL." }),
-    tokenUrl: z.string().url({ message: "Token URL must be a valid URL." }),
-    identifierPath: z
-        .string()
-        .min(1, { message: "Identifier Path is required." }),
-    emailPath: z.string().optional(),
-    namePath: z.string().optional(),
-    scopes: z.string().min(1, { message: "Scopes are required." }),
-    autoProvision: z.boolean().default(false)
-});
-
-type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
-
 export default function GeneralPage() {
     const { env } = useEnvContext();
     const api = createApiClient({ env });
@@ -72,6 +55,24 @@ export default function GeneralPage() {
     const { isUnlocked } = useLicenseStatusContext();
 
     const redirectUrl = `${env.app.dashboardUrl}/auth/idp/${idpId}/oidc/callback`;
+    const t = useTranslations();
+
+    const GeneralFormSchema = z.object({
+        name: z.string().min(2, { message: t('nameMin', {len: 2}) }),
+        clientId: z.string().min(1, { message: t('idpClientIdRequired') }),
+        clientSecret: z.string().min(1, { message: t('idpClientSecretRequired') }),
+        authUrl: z.string().url({ message: t('idpErrorAuthUrlInvalid') }),
+        tokenUrl: z.string().url({ message: t('idpErrorTokenUrlInvalid') }),
+        identifierPath: z
+            .string()
+            .min(1, { message: t('idpPathRequired') }),
+        emailPath: z.string().optional(),
+        namePath: z.string().optional(),
+        scopes: z.string().min(1, { message: t('idpScopeRequired') }),
+        autoProvision: z.boolean().default(false)
+    });
+
+    type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
 
     const form = useForm<GeneralFormValues>({
         resolver: zodResolver(GeneralFormSchema),
@@ -89,8 +90,6 @@ export default function GeneralPage() {
         }
     });
 
-    const t = useTranslations();
-
     useEffect(() => {
         const loadIdp = async () => {
             try {

src/app/admin/idp/[idpId]/layout.tsx

@@ -15,7 +15,7 @@ import {
     BreadcrumbPage,
     BreadcrumbSeparator
 } from "@app/components/ui/breadcrumb";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 interface SettingsLayoutProps {
     children: React.ReactNode;
@@ -52,7 +52,7 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
     return (
         <>
             <SettingsSectionTitle
-                title={t('idpSettings', { idpName: idp?.idp.name })}
+                title={t('idpSettings', { idpName: idp.idp.name })}
                 description={t('idpSettingsDescription')}
             />
 

src/app/admin/idp/[idpId]/policies/page.tsx

@@ -70,20 +70,6 @@ type Organization = {
     name: string;
 };
 
-const policyFormSchema = z.object({
-    orgId: z.string().min(1, { message: "Organization is required" }),
-    roleMapping: z.string().optional(),
-    orgMapping: z.string().optional()
-});
-
-const defaultMappingsSchema = z.object({
-    defaultRoleMapping: z.string().optional(),
-    defaultOrgMapping: z.string().optional()
-});
-
-type PolicyFormValues = z.infer<typeof policyFormSchema>;
-type DefaultMappingsValues = z.infer<typeof defaultMappingsSchema>;
-
 export default function PoliciesPage() {
     const { env } = useEnvContext();
     const api = createApiClient({ env });
@@ -102,6 +88,20 @@ export default function PoliciesPage() {
     const [showAddDialog, setShowAddDialog] = useState(false);
     const [editingPolicy, setEditingPolicy] = useState<PolicyRow | null>(null);
 
+    const policyFormSchema = z.object({
+        orgId: z.string().min(1, { message: t('orgRequired') }),
+        roleMapping: z.string().optional(),
+        orgMapping: z.string().optional()
+    });
+
+    const defaultMappingsSchema = z.object({
+        defaultRoleMapping: z.string().optional(),
+        defaultOrgMapping: z.string().optional()
+    });
+
+    type PolicyFormValues = z.infer<typeof policyFormSchema>;
+    type DefaultMappingsValues = z.infer<typeof defaultMappingsSchema>;
+
     const form = useForm<PolicyFormValues>({
         resolver: zodResolver(policyFormSchema),
         defaultValues: {

src/app/admin/idp/create/page.tsx

@@ -39,38 +39,6 @@ import { Badge } from "@app/components/ui/badge";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { useTranslations } from "next-intl";
 
-const createIdpFormSchema = z.object({
-    name: z.string().min(2, "Name must be at least 2 characters."),
-    type: z.enum(["oidc"]),
-    clientId: z.string().min(1, { message: "Client ID is required." }),
-    clientSecret: z.string().min(1, { message: "Client Secret is required." }),
-    authUrl: z.string().url({ message: "Auth URL must be a valid URL." }),
-    tokenUrl: z.string().url({ message: "Token URL must be a valid URL." }),
-    identifierPath: z
-        .string()
-        .min(1, { message: "Identifier Path is required." }),
-    emailPath: z.string().optional(),
-    namePath: z.string().optional(),
-    scopes: z.string().min(1, { message: "Scopes are required." }),
-    autoProvision: z.boolean().default(false)
-});
-
-type CreateIdpFormValues = z.infer<typeof createIdpFormSchema>;
-
-interface ProviderTypeOption {
-    id: "oidc";
-    title: string;
-    description: string;
-}
-
-const providerTypes: ReadonlyArray<ProviderTypeOption> = [
-    {
-        id: "oidc",
-        title: "OAuth2/OIDC",
-        description: "Configure an OpenID Connect identity provider"
-    }
-];
-
 export default function Page() {
     const { env } = useEnvContext();
     const api = createApiClient({ env });
@@ -79,6 +47,38 @@ export default function Page() {
     const { isUnlocked } = useLicenseStatusContext();
     const t = useTranslations();
 
+    const createIdpFormSchema = z.object({
+        name: z.string().min(2, { message: t('nameMin', {len: 2}) }),
+        type: z.enum(["oidc"]),
+        clientId: z.string().min(1, { message: t('idpClientIdRequired') }),
+        clientSecret: z.string().min(1, { message: t('idpClientSecretRequired') }),
+        authUrl: z.string().url({ message: t('idpErrorAuthUrlInvalid') }),
+        tokenUrl: z.string().url({ message: t('idpErrorTokenUrlInvalid') }),
+        identifierPath: z
+            .string()
+            .min(1, { message: t('idpPathRequired') }),
+        emailPath: z.string().optional(),
+        namePath: z.string().optional(),
+        scopes: z.string().min(1, { message: t('idpScopeRequired') }),
+        autoProvision: z.boolean().default(false)
+    });
+
+    type CreateIdpFormValues = z.infer<typeof createIdpFormSchema>;
+
+    interface ProviderTypeOption {
+        id: "oidc";
+        title: string;
+        description: string;
+    }
+
+    const providerTypes: ReadonlyArray<ProviderTypeOption> = [
+        {
+            id: "oidc",
+            title: "OAuth2/OIDC",
+            description: t('idpOidcDescription')
+        }
+    ];
+
     const form = useForm<CreateIdpFormValues>({
         resolver: zodResolver(createIdpFormSchema),
         defaultValues: {

src/app/admin/idp/page.tsx

@@ -3,7 +3,7 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { AxiosResponse } from "axios";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import IdpTable, { IdpRow } from "./AdminIdpTable";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 export default async function IdpPage() {
     let idps: IdpRow[] = [];

src/app/admin/license/LicenseKeysDataTable.tsx

@@ -8,7 +8,7 @@ import { LicenseKeyCache } from "@server/license/license";
 import { ArrowUpDown } from "lucide-react";
 import moment from "moment";
 import CopyToClipboard from "@app/components/CopyToClipboard";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 type LicenseKeysDataTableProps = {
     licenseKeys: LicenseKeyCache[];

src/app/admin/license/components/SitePriceCalculator.tsx

@@ -11,7 +11,7 @@ import {
     CredenzaHeader,
     CredenzaTitle
 } from "@app/components/Credenza";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 type SitePriceCalculatorProps = {
     isOpen: boolean;

src/app/admin/license/page.tsx

@@ -54,17 +54,7 @@ import Link from "next/link";
 import { Checkbox } from "@app/components/ui/checkbox";
 import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
 import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
-import { useTranslations } from 'next-intl';
-
-const formSchema = z.object({
-    licenseKey: z
-        .string()
-        .nonempty({ message: "License key is required" })
-        .max(255),
-    agreeToTerms: z.boolean().refine((val) => val === true, {
-        message: "You must agree to the license terms"
-    })
-});
+import { useTranslations } from "next-intl";
 
 function obfuscateLicenseKey(key: string): string {
     if (key.length <= 8) return key;
@@ -95,6 +85,18 @@ export default function LicensePage() {
     const [isRecheckingLicense, setIsRecheckingLicense] = useState(false);
     const { supporterStatus } = useSupporterStatusContext();
 
+    const t = useTranslations();
+
+    const formSchema = z.object({
+        licenseKey: z
+            .string()
+            .nonempty({ message: t('licenseKeyRequired') })
+            .max(255),
+        agreeToTerms: z.boolean().refine((val) => val === true, {
+            message: t('licenseTermsAgree')
+        })
+    });
+
     const form = useForm<z.infer<typeof formSchema>>({
         resolver: zodResolver(formSchema),
         defaultValues: {
@@ -103,8 +105,6 @@ export default function LicensePage() {
         }
     });
 
-    const t = useTranslations();
-
     useEffect(() => {
         async function load() {
             setIsInitialLoading(true);

src/app/admin/users/AdminUsersDataTable.tsx

@@ -4,7 +4,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/admin/users/AdminUsersTable.tsx

@@ -11,7 +11,7 @@ import { toast } from "@app/hooks/useToast";
 import { formatAxiosError } from "@app/lib/api";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useTranslations } from 'next-intl';
+import { useTranslations } from "next-intl";
 
 export type GlobalUserRow = {
     id: string;

src/app/admin/users/page.tsx

@@ -6,7 +6,7 @@ import { AdminListUsersResponse } from "@server/routers/user/adminListUsers";
 import UsersTable, { GlobalUserRow } from "./AdminUsersTable";
 import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
 import { InfoIcon } from "lucide-react";
-import { getTranslations } from 'next-intl/server';
+import { getTranslations } from "next-intl/server";
 
 type PageProps = {
     params: Promise<{ orgId: string }>;