Merge pull request #111 from SergeWilfried/zodi18n

Zodi18n
SergeWilfried · Feb 25, 2024 · 052b851 · 052b851
2 parents 9bbbb61 + fb370a6
commit 052b851
Show file tree

Hide file tree

Showing 66 changed files with 286 additions and 119 deletions.
diff --git a/apps/marketing/src/api/claim-plan/types.ts b/apps/marketing/src/api/claim-plan/types.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from '@documenso/lib/i18n/settings';
 
 export const ZClaimPlanRequestSchema = z
   .object({

diff --git a/apps/marketing/src/app/(marketing)/blog/page.tsx b/apps/marketing/src/app/(marketing)/blog/page.tsx
@@ -11,6 +11,10 @@ export default async function BlogPage() {
   const { t } = await createTranslation('marketing');
 
 
+export default async function BlogPage() {
+  const { t } = await createTranslation('marketing');
+
+
   const blogPosts = allBlogPosts.sort((a, b) => {
     const dateA = new Date(a.date);
     const dateB = new Date(b.date);

diff --git a/apps/marketing/src/app/(marketing)/open/page.tsx b/apps/marketing/src/app/(marketing)/open/page.tsx
@@ -1,6 +1,6 @@
 import type { Metadata } from 'next';
 
-import { z } from 'zod';
+import { z } from '@documenso/lib/i18n/settings';
 
 import { getUserMonthlyGrowth } from '@documenso/lib/server-only/user/get-user-monthly-growth';
 

diff --git a/apps/marketing/src/app/(marketing)/oss-friends/page.tsx b/apps/marketing/src/app/(marketing)/oss-friends/page.tsx
@@ -1,7 +1,7 @@
 import type { Metadata } from 'next';
 import Image from 'next/image';
 
-import { z } from 'zod';
+import { z } from '@documenso/lib/i18n/settings';
 
 import backgroundPattern from '@documenso/assets/images/background-pattern.png';
 

diff --git a/apps/marketing/src/app/(marketing)/oss-friends/schema.ts b/apps/marketing/src/app/(marketing)/oss-friends/schema.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from '@documenso/lib/i18n/settings';
 
 export const ZOSSFriendsSchema = z.array(
   z.object({

diff --git a/apps/marketing/src/app/(marketing)/pricing/page.tsx b/apps/marketing/src/app/(marketing)/pricing/page.tsx
@@ -55,9 +55,9 @@ export default async function PricingPage() {
 
         <div className="mt-4 flex justify-center">
           <Button variant="outline" size="lg" className="rounded-full hover:cursor-pointer" asChild>
-            <Link href="https://github.com/documenso/documenso" target="_blank">
-              {t('get-started')}
 
+            <Link href="https://github.com/documenso/documenso" target="_blank" rel="noreferrer">
+              {t('get-started')}
             </Link>
           </Button>
         </div>

diff --git a/apps/marketing/src/components/(marketing)/pricing-table.tsx b/apps/marketing/src/components/(marketing)/pricing-table.tsx
@@ -117,8 +117,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           </p>
 
           <Button className="mt-6 rounded-full text-base" asChild>
-            <Link href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup`}>{t('signup-now')}</Link>
-
+            <Link target="_blank" href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup`}>{t('signup-now')}</Link>
           </Button>
 
           <div className="mt-8 flex w-full flex-col divide-y">
@@ -136,8 +135,8 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
               <strong>
                 {' '}
                 <a href="https://documenso.com/blog/early-adopters" rel="noreferrer" target="_blank">
-                  {t('includes-all-upcoming-features')}
 
+                  {t('includes-all-upcoming-features')}
                 </a>
               </strong>
             </p>

diff --git a/apps/marketing/src/components/(marketing)/widget.tsx b/apps/marketing/src/components/(marketing)/widget.tsx
@@ -9,8 +9,9 @@ import { Loader } from 'lucide-react';
 import { usePlausible } from 'next-plausible';
 import { env } from 'next-runtime-env';
 import { Controller, useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from '@documenso/lib/i18n/settings';
 
+import { useTranslation } from '@documenso/lib/i18n/client';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -33,8 +34,10 @@ import { FormErrorMessage } from '../form/form-error-message';
 
 const ZWidgetFormSchema = z
   .object({
-    email: z.string().email({ message: 'Please enter a valid email address.' }),
-    name: z.string().trim().min(3, { message: 'Please enter a valid name.' }),
+    email: z.string().email({ message: 'please-enter-a-valid-email-address'}),
+    name: z
+    .string()
+    .trim().min(3, { message: 'please-enter-a-valid-name' }),
   })
   .and(
     z.union([
@@ -149,7 +152,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
       const planId = env('NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID');
 
       if (!planId) {
-        throw new Error('No plan ID found.');
+        throw new Error(t('no-plan-id-found'));
       }
 
       const claimPlanInput = signatureDataUrl
@@ -315,10 +318,13 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
 
             <div className="flex items-center justify-between">
               <p className="text-muted-foreground text-xs">
-                {isValid ? t('ready-for-signing') : `${stepsRemaining} step(s) until signed`}
+                {isValid ? t('ready-for-signing') : t('steps-remaining-step-s-until-signed-singular', {count: steps})}
+              </p>
+
+              <p className="text-muted-foreground block text-xs md:hidden">
+                {t('minimise-contract')}
               </p>
 
-              <p className="text-muted-foreground block text-xs md:hidden">{t('minimise-contract')}</p>
             </div>
 
             <div className="bg-background relative mt-2.5 h-[2px] w-full">
@@ -400,7 +406,9 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
           <DialogDescription>
             {t('by-signing-you-signal-your-support-of-montampons-mission-in-a')} <br></br>
             <strong>{t('non-legally-binding-but-heartfelt-way')}</strong>. <br></br>
-            <br></br>{t('you-also-unlock-the-option')}
+            <br></br>
+            {t('you-also-unlock-the-option')}
+
           </DialogDescription>
 
           <SignaturePad

diff --git a/apps/web/src/components/(teams)/dialogs/delete-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/delete-team-dialog.tsx
@@ -6,9 +6,9 @@ import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
 import { AppError } from '@documenso/lib/errors/app-error';
+import { z } from '@documenso/lib/i18n/settings';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -31,6 +31,7 @@ import {
 import { Input } from '@documenso/ui/primitives/input';
 import type { Toast } from '@documenso/ui/primitives/use-toast';
 import { useToast } from '@documenso/ui/primitives/use-toast';
+import { useTranslation } from '@documenso/lib/i18n/client';
 
 export type DeleteTeamDialogProps = {
   teamId: number;
@@ -41,14 +42,14 @@ export type DeleteTeamDialogProps = {
 export const DeleteTeamDialog = ({ trigger, teamId, teamName }: DeleteTeamDialogProps) => {
   const router = useRouter();
   const [open, setOpen] = useState(false);
-
+  const { t } = useTranslation('web');
   const { toast } = useToast();
 
-  const deleteMessage = `delete ${teamName}`;
+  const deleteMessage = t(`delete-message`, {teamName});
 
   const ZDeleteTeamFormSchema = z.object({
     teamName: z.literal(deleteMessage, {
-      errorMap: () => ({ message: `You must enter '${deleteMessage}' to proceed` }),
+      errorMap: () => ({ message: t(`you-must-enter`, {deleteMessage})}),
     }),
   });
 

diff --git a/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx b/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx
@@ -6,9 +6,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { Mail, PlusCircle, Trash } from 'lucide-react';
 import { useFieldArray, useForm } from 'react-hook-form';
-import { z } from 'zod';
 
 import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
+import { z } from '@documenso/lib/i18n/settings';
 import { TeamMemberRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { ZCreateTeamMemberInvitesMutationSchema } from '@documenso/trpc/server/team-router/schema';
@@ -40,6 +40,7 @@ import {
   SelectValue,
 } from '@documenso/ui/primitives/select';
 import { useToast } from '@documenso/ui/primitives/use-toast';
+import { useTranslation } from '@documenso/lib/i18n/client';
 
 export type InviteTeamMembersDialogProps = {
   currentUserTeamRole: TeamMemberRole;
@@ -58,7 +59,7 @@ const ZInviteTeamMembersFormSchema = z
       return new Set(emails).size === emails.length;
     },
     // Dirty hack to handle errors when .root is populated for an array type
-    { message: 'Members must have unique emails', path: ['members__root'] },
+    { message: 'members-must-have-unique-emails', path: ['members__root'] },
   );
 
 type TInviteTeamMembersFormSchema = z.infer<typeof ZInviteTeamMembersFormSchema>;
@@ -70,7 +71,7 @@ export const InviteTeamMembersDialog = ({
   ...props
 }: InviteTeamMembersDialogProps) => {
   const [open, setOpen] = useState(false);
-
+  const { t } = useTranslation('web');
   const { toast } = useToast();
 
   const form = useForm<TInviteTeamMembersFormSchema>({

diff --git a/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx
@@ -7,9 +7,9 @@ import { useRouter } from 'next/navigation';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { z } from '@documenso/lib/i18n/settings';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@@ -39,6 +39,7 @@ import {
   SelectValue,
 } from '@documenso/ui/primitives/select';
 import { useToast } from '@documenso/ui/primitives/use-toast';
+import { useTranslation } from '@documenso/lib/i18n/client';
 
 export type TransferTeamDialogProps = {
   teamId: number;
@@ -55,7 +56,7 @@ export const TransferTeamDialog = ({
 }: TransferTeamDialogProps) => {
   const router = useRouter();
   const [open, setOpen] = useState(false);
-
+  const { t } = useTranslation('web');
   const { toast } = useToast();
 
   const { mutateAsync: requestTeamOwnershipTransfer } =
@@ -70,11 +71,11 @@ export const TransferTeamDialog = ({
     teamId,
   });
 
-  const confirmTransferMessage = `transfer ${teamName}`;
+  const confirmTransferMessage = t(`transfer-to-message`, {teamName});
 
   const ZTransferTeamFormSchema = z.object({
     teamName: z.literal(confirmTransferMessage, {
-      errorMap: () => ({ message: `You must enter '${confirmTransferMessage}' to proceed` }),
+      errorMap: () => ({ message: t(`you-must-enter`, {confirmTransferMessage})}),
     }),
     newOwnerUserId: z.string(),
     clearPaymentMethods: z.boolean(),

diff --git a/apps/web/src/components/(teams)/dialogs/update-team-email-dialog.tsx b/apps/web/src/components/(teams)/dialogs/update-team-email-dialog.tsx
@@ -7,8 +7,8 @@ import { useRouter } from 'next/navigation';
 import { zodResolver } from '@hookform/resolvers/zod';
 import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import type { TeamEmail } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
@@ -38,7 +38,7 @@ export type UpdateTeamEmailDialogProps = {
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 
 const ZUpdateTeamEmailFormSchema = z.object({
-  name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
+  name: z.string().trim().min(1, { message: 'please-enter-a-valid-name' }),
 });
 
 type TUpdateTeamEmailFormSchema = z.infer<typeof ZUpdateTeamEmailFormSchema>;

diff --git a/apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx b/apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx
@@ -5,9 +5,9 @@ import { useEffect, useState } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
 import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
+import { z } from '@documenso/lib/i18n/settings';
 import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
 import { TeamMemberRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';

diff --git a/apps/web/src/components/forms/2fa/disable-authenticator-app-dialog.tsx b/apps/web/src/components/forms/2fa/disable-authenticator-app-dialog.tsx
@@ -3,8 +3,8 @@ import { useRouter } from 'next/navigation';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { flushSync } from 'react-dom';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {

diff --git a/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx b/apps/web/src/components/forms/2fa/enable-authenticator-app-dialog.tsx
@@ -4,8 +4,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 import { renderSVG } from 'uqr';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import { downloadFile } from '@documenso/lib/client-only/download-file';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';

diff --git a/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx b/apps/web/src/components/forms/2fa/view-recovery-codes-dialog.tsx
@@ -3,8 +3,8 @@ import { useMemo } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import { downloadFile } from '@documenso/lib/client-only/download-file';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';

diff --git a/apps/web/src/components/forms/forgot-password.tsx b/apps/web/src/components/forms/forgot-password.tsx
@@ -4,8 +4,8 @@ import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';

diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsx
@@ -2,8 +2,8 @@
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import type { User } from '@documenso/prisma/client';
 import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
@@ -20,6 +20,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
+import { useTranslation } from '@documenso/lib/i18n/client';
 
 export const ZPasswordFormSchema = z
   .object({
@@ -28,7 +29,7 @@ export const ZPasswordFormSchema = z
     repeatedPassword: ZPasswordSchema,
   })
   .refine((data) => data.password === data.repeatedPassword, {
-    message: 'Passwords do not match',
+    message: 'passwords-dont-match',
     path: ['repeatedPassword'],
   });
 
@@ -41,6 +42,7 @@ export type PasswordFormProps = {
 
 export const PasswordForm = ({ className }: PasswordFormProps) => {
   const { toast } = useToast();
+  const { t } = useTranslation('web');
 
   const form = useForm<TPasswordFormSchema>({
     values: {
@@ -99,7 +101,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
             name="currentPassword"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Current Password</FormLabel>
+                <FormLabel>{t('current-password')}</FormLabel>
                 <FormControl>
                   <PasswordInput autoComplete="current-password" {...field} />
                 </FormControl>
@@ -113,7 +115,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
             name="password"
             render={({ field }) => (
               <FormItem>
-                <FormLabel>Password</FormLabel>
+                <FormLabel>{t('password')}</FormLabel>
                 <FormControl>
                   <PasswordInput autoComplete="new-password" {...field} />
                 </FormControl>

diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx
@@ -4,8 +4,8 @@ import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
+import { z } from '@documenso/lib/i18n/settings';
 import type { User } from '@documenso/prisma/client';
 import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
@@ -25,8 +25,8 @@ import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export const ZProfileFormSchema = z.object({
-  name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
-  signature: z.string().min(1, 'Signature Pad cannot be empty'),
+  name: z.string().trim().min(1, { message: 'please-enter-a-valid-name' }),
+  signature: z.string().min(1, 'signature-pad-cannot-be-empty'),
 });
 
 export const ZTwoFactorAuthTokenSchema = z.object({