The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: placeholders translations (#2020)
samuel-cglg74a03077b783
diff --git a/apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx b/apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsxindex 7f6bee7bb..a8332e7bb 100644--- a/apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx+++ b/apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx@@ -1,7 +1,7 @@import { useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { useForm } from 'react-hook-form';import { z } from 'zod';@@ -57,6 +57,7 @@ export function AssistantConfirmationDialog({allowDictateNextSigner = false,defaultNextSigner,}: ConfirmationDialogProps) {+ const { t } = useLingui();const [isEditingNextSigner, setIsEditingNextSigner] = useState(false);const form = useForm<TNextSignerFormSchema>({@@ -146,7 +147,7 @@ export function AssistantConfirmationDialog({<Input{...field}className="mt-2"- placeholder="Enter the next signer's name"+ placeholder={t`Enter the next signer's name`}/></FormControl>@@ -168,7 +169,7 @@ export function AssistantConfirmationDialog({{...field}type="email"className="mt-2"- placeholder="Enter the next signer's email"+ placeholder={t`Enter the next signer's email`}/></FormControl><FormMessage />diff --git a/apps/remix/app/components/dialogs/organisation-email-create-dialog.tsx b/apps/remix/app/components/dialogs/organisation-email-create-dialog.tsxindex c05fadd8c..cb7ab064a 100644--- a/apps/remix/app/components/dialogs/organisation-email-create-dialog.tsx+++ b/apps/remix/app/components/dialogs/organisation-email-create-dialog.tsx@@ -1,8 +1,7 @@import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { useLingui } from '@lingui/react/macro';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import type * as DialogPrimitive from '@radix-ui/react-dialog';import { useForm } from 'react-hook-form';import type { z } from 'zod';@@ -149,7 +148,7 @@ export const OrganisationEmailCreateDialog = ({<Trans>Display Name</Trans></FormLabel><FormControl>- <Input {...field} placeholder="Support" />+ <Input {...field} placeholder={t`Support`} /></FormControl><FormMessage /><FormDescription>@@ -175,7 +174,7 @@ export const OrganisationEmailCreateDialog = ({onChange={(e) => {field.onChange(e.target.value + '@' + emailDomain.domain);}}- placeholder="support"+ placeholder={t`support`}/><div className="bg-muted text-muted-foreground absolute bottom-0 right-0 top-0 flex items-center rounded-r-md border px-3 py-2 text-sm">@{emailDomain.domain}diff --git a/apps/remix/app/components/dialogs/organisation-email-update-dialog.tsx b/apps/remix/app/components/dialogs/organisation-email-update-dialog.tsxindex 4bca18d8d..d6a2851fb 100644--- a/apps/remix/app/components/dialogs/organisation-email-update-dialog.tsx+++ b/apps/remix/app/components/dialogs/organisation-email-update-dialog.tsx@@ -1,8 +1,7 @@import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { useLingui } from '@lingui/react/macro';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import type * as DialogPrimitive from '@radix-ui/react-dialog';import { useForm } from 'react-hook-form';import type { z } from 'zod';@@ -134,7 +133,7 @@ export const OrganisationEmailUpdateDialog = ({<Trans>Display Name</Trans></FormLabel><FormControl>- <Input {...field} placeholder="Support" />+ <Input {...field} placeholder={t`Support`} /></FormControl><FormMessage /><FormDescription>diff --git a/apps/remix/app/components/dialogs/passkey-create-dialog.tsx b/apps/remix/app/components/dialogs/passkey-create-dialog.tsxindex 0fa2ccbba..77bd54b57 100644--- a/apps/remix/app/components/dialogs/passkey-create-dialog.tsx+++ b/apps/remix/app/components/dialogs/passkey-create-dialog.tsx@@ -1,9 +1,7 @@import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Plural, Trans } from '@lingui/react/macro';+import { Plural, Trans, useLingui } from '@lingui/react/macro';import type * as DialogPrimitive from '@radix-ui/react-dialog';import { startRegistration } from '@simplewebauthn/browser';import { KeyRoundIcon } from 'lucide-react';@@ -54,7 +52,7 @@ export const PasskeyCreateDialog = ({ trigger, onSuccess, ...props }: PasskeyCreconst [open, setOpen] = useState(false);const [formError, setFormError] = useState<string | null>(null);- const { _ } = useLingui();+ const { t } = useLingui();const { toast } = useToast();const form = useForm<TCreatePasskeyFormSchema>({@@ -83,7 +81,7 @@ export const PasskeyCreateDialog = ({ trigger, onSuccess, ...props }: PasskeyCre});toast({- description: _(msg`Successfully created passkey`),+ description: t`Successfully created passkey`,duration: 5000,});@@ -176,7 +174,7 @@ export const PasskeyCreateDialog = ({ trigger, onSuccess, ...props }: PasskeyCre<Trans>Passkey name</Trans></FormLabel><FormControl>- <Input className="bg-background" placeholder="eg. Mac" {...field} />+ <Input className="bg-background" placeholder={t`eg. Mac`} {...field} /></FormControl><FormMessage /></FormItem>diff --git a/apps/remix/app/components/dialogs/team-email-add-dialog.tsx b/apps/remix/app/components/dialogs/team-email-add-dialog.tsxindex 56e54da72..9def7d061 100644--- a/apps/remix/app/components/dialogs/team-email-add-dialog.tsx+++ b/apps/remix/app/components/dialogs/team-email-add-dialog.tsx@@ -1,9 +1,7 @@import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import type * as DialogPrimitive from '@radix-ui/react-dialog';import { Plus } from 'lucide-react';import { useForm } from 'react-hook-form';@@ -49,7 +47,7 @@ type TCreateTeamEmailFormSchema = z.infer<typeof ZCreateTeamEmailFormSchema>;export const TeamEmailAddDialog = ({ teamId, trigger, ...props }: TeamEmailAddDialogProps) => {const [open, setOpen] = useState(false);- const { _ } = useLingui();+ const { t } = useLingui();const { toast } = useToast();const { revalidate } = useRevalidator();@@ -73,8 +71,8 @@ export const TeamEmailAddDialog = ({ teamId, trigger, ...props }: TeamEmailAddDi});toast({- title: _(msg`Success`),- description: _(msg`We have sent a confirmation email for verification.`),+ title: t`Success`,+ description: t`We have sent a confirmation email for verification.`,duration: 5000,});@@ -87,17 +85,15 @@ export const TeamEmailAddDialog = ({ teamId, trigger, ...props }: TeamEmailAddDiif (error.code === AppErrorCode.ALREADY_EXISTS) {form.setError('email', {type: 'manual',- message: _(msg`This email is already being used by another team.`),+ message: t`This email is already being used by another team.`,});return;}toast({- title: _(msg`An unknown error occurred`),- description: _(- msg`We encountered an unknown error while attempting to add this email. Please try again later.`,- ),+ title: t`An unknown error occurred`,+ description: t`We encountered an unknown error while attempting to add this email. Please try again later.`,variant: 'destructive',});}@@ -150,7 +146,7 @@ export const TeamEmailAddDialog = ({ teamId, trigger, ...props }: TeamEmailAddDi<Trans>Name</Trans></FormLabel><FormControl>- <Input className="bg-background" placeholder="eg. Legal" {...field} />+ <Input className="bg-background" placeholder={t`eg. Legal`} {...field} /></FormControl><FormMessage /></FormItem>diff --git a/apps/remix/app/components/dialogs/team-email-update-dialog.tsx b/apps/remix/app/components/dialogs/team-email-update-dialog.tsxindex dd5411b59..6703f6a4f 100644--- a/apps/remix/app/components/dialogs/team-email-update-dialog.tsx+++ b/apps/remix/app/components/dialogs/team-email-update-dialog.tsx@@ -1,9 +1,7 @@import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import type { TeamEmail } from '@prisma/client';import type * as DialogPrimitive from '@radix-ui/react-dialog';import { useForm } from 'react-hook-form';@@ -50,7 +48,7 @@ export const TeamEmailUpdateDialog = ({}: TeamEmailUpdateDialogProps) => {const [open, setOpen] = useState(false);- const { _ } = useLingui();+ const { t } = useLingui();const { toast } = useToast();const { revalidate } = useRevalidator();@@ -73,8 +71,8 @@ export const TeamEmailUpdateDialog = ({});toast({- title: _(msg`Success`),- description: _(msg`Team email was updated.`),+ title: t`Success`,+ description: t`Team email was updated.`,duration: 5000,});@@ -83,10 +81,8 @@ export const TeamEmailUpdateDialog = ({setOpen(false);} catch (err) {toast({- title: _(msg`An unknown error occurred`),- description: _(- msg`We encountered an unknown error while attempting update the team email. Please try again later.`,- ),+ title: t`An unknown error occurred`,+ description: t`We encountered an unknown error while attempting update the team email. Please try again later.`,variant: 'destructive',});}@@ -138,7 +134,7 @@ export const TeamEmailUpdateDialog = ({<Trans>Name</Trans></FormLabel><FormControl>- <Input className="bg-background" placeholder="eg. Legal" {...field} />+ <Input className="bg-background" placeholder={t`eg. Legal`} {...field} /></FormControl><FormMessage /></FormItem>diff --git a/apps/remix/app/components/dialogs/webhook-test-dialog.tsx b/apps/remix/app/components/dialogs/webhook-test-dialog.tsxindex 7023e08a1..a4a8cb3a8 100644--- a/apps/remix/app/components/dialogs/webhook-test-dialog.tsx+++ b/apps/remix/app/components/dialogs/webhook-test-dialog.tsx@@ -1,9 +1,7 @@import { useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import type { Webhook } from '@prisma/client';import { WebhookTriggerEvents } from '@prisma/client';import { useForm } from 'react-hook-form';@@ -52,7 +50,7 @@ const ZTestWebhookFormSchema = z.object({type TTestWebhookFormSchema = z.infer<typeof ZTestWebhookFormSchema>;export const WebhookTestDialog = ({ webhook, children }: WebhookTestDialogProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const { toast } = useToast();const team = useCurrentTeam();@@ -77,18 +75,16 @@ export const WebhookTestDialog = ({ webhook, children }: WebhookTestDialogProps)});toast({- title: _(msg`Test webhook sent`),- description: _(msg`The test webhook has been successfully sent to your endpoint.`),+ title: t`Test webhook sent`,+ description: t`The test webhook has been successfully sent to your endpoint.`,duration: 5000,});setOpen(false);} catch (error) {toast({- title: _(msg`Test webhook failed`),- description: _(- msg`We encountered an error while sending the test webhook. Please check your endpoint and try again.`,- ),+ title: t`Test webhook failed`,+ description: t`We encountered an error while sending the test webhook. Please check your endpoint and try again.`,variant: 'destructive',duration: 5000,});@@ -129,7 +125,7 @@ export const WebhookTestDialog = ({ webhook, children }: WebhookTestDialogProps)<Select onValueChange={field.onChange} value={field.value}><FormControl><SelectTrigger>- <SelectValue placeholder="Select an event type" />+ <SelectValue placeholder={t`Select an event type`} /></SelectTrigger></FormControl><SelectContent>diff --git a/apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx b/apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsxindex 7beecdcbe..e6f533945 100644--- a/apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx+++ b/apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx@@ -1,5 +1,4 @@-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { DocumentDistributionMethod } from '@prisma/client';import { InfoIcon } from 'lucide-react';import type { Control } from 'react-hook-form';@@ -45,7 +44,7 @@ export const ConfigureDocumentAdvancedSettings = ({control,isSubmitting,}: ConfigureDocumentAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const form = useFormContext<TConfigureEmbedFormSchema>();const { features } = useConfigureDocument();@@ -121,13 +120,13 @@ export const ConfigureDocumentAdvancedSettings = ({<FormControl><MultiSelectComboboxoptions={Object.values(DOCUMENT_SIGNATURE_TYPES).map((option) => ({- label: _(option.label),+ label: t(option.label),value: option.value,}))}selectedValues={field.value}onChange={field.onChange}className="bg-background w-full"- emptySelectionPlaceholder="Select signature types"+ emptySelectionPlaceholder={t`Select signature types`}/></FormControl><FormMessage />diff --git a/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx b/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsxindex 6446a1e59..5f365d452 100644--- a/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx@@ -1,7 +1,7 @@import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { useForm } from 'react-hook-form';import { z } from 'zod';@@ -46,6 +46,8 @@ export const DocumentSigningAuthPassword = ({open,onOpenChange,}: DocumentSigningAuthPasswordProps) => {+ const { t } = useLingui();+const { recipient, isCurrentlyAuthenticating, setIsCurrentlyAuthenticating } =useRequiredDocumentSigningAuthContext();@@ -120,7 +122,7 @@ export const DocumentSigningAuthPassword = ({<FormControl><Inputtype="password"- placeholder="Enter your password"+ placeholder={t`Enter your password`}{...field}autoComplete="current-password"/>diff --git a/apps/remix/app/components/general/document-signing/document-signing-reject-dialog.tsx b/apps/remix/app/components/general/document-signing/document-signing-reject-dialog.tsxindex 9c1c507e2..ac7ffc745 100644--- a/apps/remix/app/components/general/document-signing/document-signing-reject-dialog.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-reject-dialog.tsx@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';import { msg } from '@lingui/core/macro';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { useForm } from 'react-hook-form';import { useNavigate } from 'react-router';import { useSearchParams } from 'react-router';@@ -48,6 +48,7 @@ export function DocumentSigningRejectDialog({onRejected,trigger,}: DocumentSigningRejectDialogProps) {+ const { t } = useLingui();const { toast } = useToast();const navigate = useNavigate();const [searchParams] = useSearchParams();@@ -141,7 +142,7 @@ export function DocumentSigningRejectDialog({<Textarea{...field}rows={4}- placeholder="Please provide a reason for rejecting this document"+ placeholder={t`Please provide a reason for rejecting this document`}disabled={form.formState.isSubmitting}/></FormControl>diff --git a/packages/ui/components/document/document-visibility-select.tsx b/packages/ui/components/document/document-visibility-select.tsxindex 16871e57e..399cffddc 100644--- a/packages/ui/components/document/document-visibility-select.tsx+++ b/packages/ui/components/document/document-visibility-select.tsx@@ -1,5 +1,6 @@import React, { forwardRef } from 'react';+import { useLingui } from '@lingui/react/macro';import { TeamMemberRole } from '@prisma/client';import type { SelectProps } from '@radix-ui/react-select';import { InfoIcon } from 'lucide-react';@@ -27,6 +28,8 @@ export const DocumentVisibilitySelect = forwardRef<HTMLButtonElement, DocumentVi{ currentTeamMemberRole, isTeamSettings = false, disabled, canUpdateVisibility, ...props },ref,) => {+ const { t } = useLingui();+const isAdmin = currentTeamMemberRole === TeamMemberRole.ADMIN;const isManager = currentTeamMemberRole === TeamMemberRole.MANAGER;const canEdit = isTeamSettings || canUpdateVisibility;@@ -34,7 +37,7 @@ export const DocumentVisibilitySelect = forwardRef<HTMLButtonElement, DocumentVireturn (<Select {...props} disabled={!canEdit || disabled}><SelectTrigger ref={ref} className="bg-background text-muted-foreground">- <SelectValue data-testid="documentVisibilitySelectValue" placeholder="Everyone" />+ <SelectValue data-testid="documentVisibilitySelectValue" placeholder={t`Everyone`} /></SelectTrigger><SelectContent position="popper">diff --git a/packages/ui/primitives/document-flow/add-settings.tsx b/packages/ui/primitives/document-flow/add-settings.tsxindex a96fe4e42..d527196fd 100644--- a/packages/ui/primitives/document-flow/add-settings.tsx+++ b/packages/ui/primitives/document-flow/add-settings.tsx@@ -419,7 +419,7 @@ export const AddSettingsFormPartial = ({void handleAutoSave();}}className="bg-background w-full"- emptySelectionPlaceholder="Select signature types"+ emptySelectionPlaceholder={t`Select signature types`}/></FormControl>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/date-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/date-field.tsxindex 8f182c5a2..20c061e02 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/date-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/date-field.tsx@@ -1,6 +1,4 @@-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { validateFields as validateDateFields } from '@documenso/lib/advanced-fields-validation/validate-fields';import { type TDateFieldMeta as DateFieldMeta } from '@documenso/lib/types/field-meta';@@ -25,7 +23,7 @@ export const DateFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: DateFieldAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();// const handleInput = (field: keyof DateFieldMeta, value: string | boolean) => {// if (field === 'fontSize') {@@ -67,7 +65,7 @@ export const DateFieldAdvancedSettings = ({id="fontSize"type="number"className="bg-background mt-2"- placeholder={_(msg`Field font size`)}+ placeholder={t`Field font size`}value={fieldState.fontSize}onChange={(e) => handleInput('fontSize', e.target.value)}min={8}@@ -85,7 +83,7 @@ export const DateFieldAdvancedSettings = ({onValueChange={(value) => handleInput('textAlign', value)}><SelectTrigger className="bg-background mt-2">- <SelectValue placeholder="Select text align" />+ <SelectValue placeholder={t`Select text align`} /></SelectTrigger><SelectContent>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/email-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/email-field.tsxindex dc92ffdd3..e7123d0c5 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/email-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/email-field.tsx@@ -1,6 +1,4 @@-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { validateFields as validateEmailFields } from '@documenso/lib/advanced-fields-validation/validate-fields';import { type TEmailFieldMeta as EmailFieldMeta } from '@documenso/lib/types/field-meta';@@ -25,7 +23,7 @@ export const EmailFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: EmailFieldAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const handleInput = (field: keyof EmailFieldMeta, value: string | boolean) => {const fontSize = field === 'fontSize' ? Number(value) : Number(fieldState.fontSize ?? 14);@@ -49,7 +47,7 @@ export const EmailFieldAdvancedSettings = ({id="fontSize"type="number"className="bg-background mt-2"- placeholder={_(msg`Field font size`)}+ placeholder={t`Field font size`}value={fieldState.fontSize}onChange={(e) => handleInput('fontSize', e.target.value)}min={8}@@ -67,7 +65,7 @@ export const EmailFieldAdvancedSettings = ({onValueChange={(value) => handleInput('textAlign', value)}><SelectTrigger className="bg-background mt-2">- <SelectValue placeholder="Select text align" />+ <SelectValue placeholder={t`Select text align`} /></SelectTrigger><SelectContent>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/initials-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/initials-field.tsxindex fba5f22fe..ec1907310 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/initials-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/initials-field.tsx@@ -1,6 +1,4 @@-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { validateFields as validateInitialsFields } from '@documenso/lib/advanced-fields-validation/validate-fields';import { type TInitialsFieldMeta as InitialsFieldMeta } from '@documenso/lib/types/field-meta';@@ -20,7 +18,7 @@ export const InitialsFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: InitialsFieldAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const handleInput = (field: keyof InitialsFieldMeta, value: string | boolean) => {const fontSize = field === 'fontSize' ? Number(value) : Number(fieldState.fontSize ?? 14);@@ -44,7 +42,7 @@ export const InitialsFieldAdvancedSettings = ({id="fontSize"type="number"className="bg-background mt-2"- placeholder={_(msg`Field font size`)}+ placeholder={t`Field font size`}value={fieldState.fontSize}onChange={(e) => handleInput('fontSize', e.target.value)}min={8}@@ -62,7 +60,7 @@ export const InitialsFieldAdvancedSettings = ({onValueChange={(value) => handleInput('textAlign', value)}><SelectTrigger className="bg-background mt-2">- <SelectValue placeholder="Select text align" />+ <SelectValue placeholder={t`Select text align`} /></SelectTrigger><SelectContent>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/name-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/name-field.tsxindex 7acaa6d7f..d138e71ce 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/name-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/name-field.tsx@@ -1,6 +1,4 @@-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { validateFields as validateNameFields } from '@documenso/lib/advanced-fields-validation/validate-fields';import { type TNameFieldMeta as NameFieldMeta } from '@documenso/lib/types/field-meta';@@ -25,7 +23,7 @@ export const NameFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: NameFieldAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const handleInput = (field: keyof NameFieldMeta, value: string | boolean) => {const fontSize = field === 'fontSize' ? Number(value) : Number(fieldState.fontSize ?? 14);@@ -49,7 +47,7 @@ export const NameFieldAdvancedSettings = ({id="fontSize"type="number"className="bg-background mt-2"- placeholder={_(msg`Field font size`)}+ placeholder={t`Field font size`}value={fieldState.fontSize}onChange={(e) => handleInput('fontSize', e.target.value)}min={8}@@ -67,7 +65,7 @@ export const NameFieldAdvancedSettings = ({onValueChange={(value) => handleInput('textAlign', value)}><SelectTrigger className="bg-background mt-2">- <SelectValue placeholder="Select text align" />+ <SelectValue placeholder={t`Select text align`} /></SelectTrigger><SelectContent>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsxindex 2106036c8..1b174c591 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx@@ -1,8 +1,6 @@import { useState } from 'react';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { ChevronDown, ChevronUp } from 'lucide-react';import { validateNumberField } from '@documenso/lib/advanced-fields-validation/validate-number';@@ -32,7 +30,7 @@ export const NumberFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: NumberFieldAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const [showValidation, setShowValidation] = useState(false);@@ -68,7 +66,7 @@ export const NumberFieldAdvancedSettings = ({<Inputid="label"className="bg-background mt-2"- placeholder={_(msg`Label`)}+ placeholder={t`Label`}value={fieldState.label}onChange={(e) => handleFieldChange('label', e.target.value)}/>@@ -80,7 +78,7 @@ export const NumberFieldAdvancedSettings = ({<Inputid="placeholder"className="bg-background mt-2"- placeholder={_(msg`Placeholder`)}+ placeholder={t`Placeholder`}value={fieldState.placeholder}onChange={(e) => handleFieldChange('placeholder', e.target.value)}/>@@ -92,7 +90,7 @@ export const NumberFieldAdvancedSettings = ({<Inputid="value"className="bg-background mt-2"- placeholder={_(msg`Value`)}+ placeholder={t`Value`}value={fieldState.value}onChange={(e) => handleInput('value', e.target.value)}/>@@ -106,7 +104,7 @@ export const NumberFieldAdvancedSettings = ({onValueChange={(val) => handleInput('numberFormat', val)}><SelectTrigger className="text-muted-foreground bg-background mt-2 w-full">- <SelectValue placeholder={_(msg`Field format`)} />+ <SelectValue placeholder={t`Field format`} /></SelectTrigger><SelectContent position="popper">{numberFormatValues.map((item, index) => (@@ -126,7 +124,7 @@ export const NumberFieldAdvancedSettings = ({id="fontSize"type="number"className="bg-background mt-2"- placeholder={_(msg`Field font size`)}+ placeholder={t`Field font size`}value={fieldState.fontSize}onChange={(e) => handleInput('fontSize', e.target.value)}min={8}@@ -144,7 +142,7 @@ export const NumberFieldAdvancedSettings = ({onValueChange={(value) => handleInput('textAlign', value)}><SelectTrigger className="bg-background mt-2">- <SelectValue placeholder="Select text align" />+ <SelectValue placeholder={t`Select text align`} /></SelectTrigger><SelectContent>@@ -198,7 +196,7 @@ export const NumberFieldAdvancedSettings = ({<Inputid="minValue"className="bg-background mt-2"- placeholder="E.g. 0"+ placeholder={t`E.g. 0`}value={fieldState.minValue ?? ''}onChange={(e) => handleInput('minValue', e.target.value)}/>@@ -210,7 +208,7 @@ export const NumberFieldAdvancedSettings = ({<Inputid="maxValue"className="bg-background mt-2"- placeholder="E.g. 100"+ placeholder={t`E.g. 100`}value={fieldState.maxValue ?? ''}onChange={(e) => handleInput('maxValue', e.target.value)}/>diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsxindex ea6bc6d15..e257f9433 100644--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx@@ -1,6 +1,4 @@-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { validateTextField } from '@documenso/lib/advanced-fields-validation/validate-text';import { type TTextFieldMeta as TextFieldMeta } from '@documenso/lib/types/field-meta';@@ -27,7 +25,7 @@ export const TextFieldAdvancedSettings = ({handleFieldChange,handleErrors,}: TextFieldAdvancedSettingsProps) => {- const { _ } = useLingui();+ const { t } = useLingui();const handleInput = (field: keyof TextFieldMeta, value: string | boolean) => {const text = field === 'text' ? String(value) : (fieldState.text ?? '');@@ -58,7 +56,7 @@ export const TextFieldAdvancedSettings = ({<Inputid="label"className="bg-background mt-2"- placeholder={_(msg`Field label`)}+ placeholder={t`Field label`}value={fieldState.label}onChange={(e) => handleFieldChange('label', e.target.value)}/>@@ -70,7 +68,7 @@ export const TextFieldAdvancedSettings = ({<Inputid="placeholder"className="bg-background mt-2"- placeholder={_(msg`Field placeholder`)}+ placeholder={t`Field placeholder`}value={fieldState.placeholder}onChange={(e) => handleFieldChange('placeholder', e.target.value)}/>@@ -83,7 +81,7 @@ export const TextFieldAdvancedSettings = ({<Textareaid="text"className="bg-background mt-2"- placeholder={_(msg`Add text to the field`)}+ placeholder={t`Add text to the field`}value={fieldState.text}onChange={(e) => handleInput('text', e.target.value)}/>@@ -98,7 +96,7 @@ export const TextFieldAdvancedSettings = ({type="number"min={0}className="bg-background mt-2"- placeholder={_(msg`Field character limit`)}+ placeholder={t`Field character limit`}value={fieldState.characterLimit}onChange={(e) => handleInput('characterLimit', e.target.value)}/>@@ -112,7 +110,7 @@ export const TextFieldAdvancedSettings = ({id="fontSize"type="number"className="bg-background mt-2"- placeholder={_(msg`Field font size`)}+ placeholder={t`Field font size`}value={fieldState.fontSize}onChange={(e) => handleInput('fontSize', e.target.value)}min={8}@@ -136,7 +134,7 @@ export const TextFieldAdvancedSettings = ({}}><SelectTrigger className="bg-background mt-2">- <SelectValue placeholder="Select text align" />+ <SelectValue placeholder={t`Select text align`} /></SelectTrigger><SelectContent>diff --git a/packages/ui/primitives/multi-select-combobox.tsx b/packages/ui/primitives/multi-select-combobox.tsxindex 64e109b28..8089482ed 100644--- a/packages/ui/primitives/multi-select-combobox.tsx+++ b/packages/ui/primitives/multi-select-combobox.tsx@@ -1,6 +1,7 @@import * as React from 'react';import type { MessageDescriptor } from '@lingui/core';+import { t } from '@lingui/core/macro';import { useLingui } from '@lingui/react';import { Trans } from '@lingui/react/macro';import { AnimatePresence } from 'framer-motion';@@ -43,7 +44,7 @@ type MultiSelectComboboxProps<T = OptionValue> = {* - Clear all button*/export function MultiSelectCombobox<T = OptionValue>({- emptySelectionPlaceholder = 'Select values...',+ emptySelectionPlaceholder = t`Select values...`,enableClearAllButton,enableSearch = true,className,diff --git a/packages/ui/primitives/signature-pad/signature-pad-type.tsx b/packages/ui/primitives/signature-pad/signature-pad-type.tsxindex 4685bc6ad..daf58e4a6 100644--- a/packages/ui/primitives/signature-pad/signature-pad-type.tsx+++ b/packages/ui/primitives/signature-pad/signature-pad-type.tsx@@ -1,5 +1,7 @@import { useState } from 'react';+import { useLingui } from '@lingui/react/macro';+import { cn } from '../../lib/utils';export type SignaturePadTypeProps = {@@ -9,6 +11,7 @@ export type SignaturePadTypeProps = {};export const SignaturePadType = ({ className, value, onChange }: SignaturePadTypeProps) => {+ const { t } = useLingui();// Colors don't actually work for text.const [selectedColor, setSelectedColor] = useState('black');@@ -16,7 +19,7 @@ export const SignaturePadType = ({ className, value, onChange }: SignaturePadTyp<div className={cn('flex h-full w-full items-center justify-center', className)}><inputdata-testid="signature-pad-type-input"- placeholder="Type your signature"+ placeholder={t`Type your signature`}className="font-signature w-full bg-transparent px-4 text-center text-7xl text-black placeholder:text-4xl focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 dark:text-white"// style={{ color: selectedColor }}value={value}diff --git a/packages/ui/primitives/template-flow/add-template-settings.tsx b/packages/ui/primitives/template-flow/add-template-settings.tsxindex 32d0a2c61..0dfef393d 100644--- a/packages/ui/primitives/template-flow/add-template-settings.tsx+++ b/packages/ui/primitives/template-flow/add-template-settings.tsx@@ -1,8 +1,7 @@import { useEffect } from 'react';import { zodResolver } from '@hookform/resolvers/zod';-import { useLingui } from '@lingui/react/macro';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { DocumentVisibility, TeamMemberRole } from '@prisma/client';import { DocumentDistributionMethod, type Field, type Recipient } from '@prisma/client';import { InfoIcon } from 'lucide-react';@@ -425,7 +424,7 @@ export const AddTemplateSettingsFormPartial = ({void handleAutoSave();}}className="bg-background w-full"- emptySelectionPlaceholder="Select signature types"+ emptySelectionPlaceholder={t`Select signature types`}/></FormControl>