From 19dc43dca133623870b8ca1b61cb369e4f877a75 Mon Sep 17 00:00:00 2001 From: David Nguyen Date: Fri, 7 Feb 2025 19:33:58 +1100 Subject: [PATCH] fix: migrate lingui --- apps/remix/app/components/dialogs/account-delete-dialog.tsx | 3 ++- .../app/components/dialogs/admin-document-delete-dialog.tsx | 3 ++- .../app/components/dialogs/admin-user-delete-dialog.tsx | 3 ++- .../app/components/dialogs/admin-user-disable-dialog.tsx | 3 ++- .../app/components/dialogs/admin-user-enable-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/create-passkey-dialog.tsx | 3 ++- .../remix/app/components/dialogs/document-delete-dialog.tsx | 3 ++- .../app/components/dialogs/document-duplicate-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/document-move-dialog.tsx | 3 ++- .../remix/app/components/dialogs/document-resend-dialog.tsx | 3 ++- .../dialogs/public-profile-template-manage-dialog.tsx | 3 ++- .../app/components/dialogs/team-checkout-create-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/team-create-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/team-delete-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/team-email-add-dialog.tsx | 3 ++- .../app/components/dialogs/team-email-delete-dialog.tsx | 3 ++- .../app/components/dialogs/team-email-update-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/team-leave-dialog.tsx | 3 ++- .../app/components/dialogs/team-member-delete-dialog.tsx | 3 ++- .../app/components/dialogs/team-member-invite-dialog.tsx | 3 ++- .../app/components/dialogs/team-member-update-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/team-transfer-dialog.tsx | 3 ++- .../remix/app/components/dialogs/template-create-dialog.tsx | 3 ++- .../remix/app/components/dialogs/template-delete-dialog.tsx | 3 ++- .../dialogs/template-direct-link-dialog-wrapper.tsx | 2 +- .../app/components/dialogs/template-direct-link-dialog.tsx | 3 ++- .../app/components/dialogs/template-duplicate-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/template-move-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/template-use-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/token-delete-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/webhook-create-dialog.tsx | 3 ++- apps/remix/app/components/dialogs/webhook-delete-dialog.tsx | 3 ++- .../app/components/embed/embed-authentication-required.tsx | 2 +- .../components/embed/embed-direct-template-client-page.tsx | 3 ++- .../remix/app/components/embed/embed-document-completed.tsx | 2 +- .../app/components/embed/embed-document-signing-page.tsx | 3 ++- .../forms/2fa/disable-authenticator-app-dialog.tsx | 3 ++- .../forms/2fa/enable-authenticator-app-dialog.tsx | 3 ++- apps/remix/app/components/forms/2fa/recovery-code-list.tsx | 2 +- .../app/components/forms/2fa/view-recovery-codes-dialog.tsx | 2 +- apps/remix/app/components/forms/avatar-image.tsx | 3 ++- apps/remix/app/components/forms/forgot-password.tsx | 3 ++- apps/remix/app/components/forms/password.tsx | 3 ++- apps/remix/app/components/forms/profile.tsx | 3 ++- .../app/components/forms/public-profile-claim-dialog.tsx | 2 +- apps/remix/app/components/forms/public-profile-form.tsx | 3 ++- apps/remix/app/components/forms/reset-password.tsx | 3 ++- apps/remix/app/components/forms/send-confirmation-email.tsx | 3 ++- apps/remix/app/components/forms/signin.tsx | 3 ++- apps/remix/app/components/forms/signup.tsx | 3 ++- .../app/components/forms/team-branding-preferences-form.tsx | 3 ++- .../app/components/forms/team-document-preferences-form.tsx | 3 ++- apps/remix/app/components/forms/team-update-form.tsx | 3 ++- apps/remix/app/components/forms/token.tsx | 3 ++- apps/remix/app/components/general/app-command-menu.tsx | 3 ++- apps/remix/app/components/general/app-nav-desktop.tsx | 3 ++- apps/remix/app/components/general/app-nav-mobile.tsx | 3 ++- apps/remix/app/components/general/avatar-with-recipient.tsx | 2 +- apps/remix/app/components/general/claim-account.tsx | 3 ++- .../direct-template/direct-template-configure-form.tsx | 3 ++- .../general/direct-template/direct-template-page.tsx | 2 +- .../direct-template/direct-template-signing-auth-page.tsx | 3 ++- .../direct-template/direct-template-signing-form.tsx | 2 +- .../general/document-signing/document-signing-auth-2fa.tsx | 3 +-- .../document-signing/document-signing-auth-account.tsx | 2 +- .../document-signing/document-signing-auth-dialog.tsx | 2 +- .../general/document-signing/document-signing-auth-page.tsx | 3 ++- .../document-signing/document-signing-auth-passkey.tsx | 3 ++- .../general/document-signing/document-signing-auto-sign.tsx | 3 ++- .../document-signing/document-signing-checkbox-field.tsx | 2 +- .../document-signing/document-signing-complete-dialog.tsx | 2 +- .../document-signing/document-signing-date-field.tsx | 3 ++- .../document-signing/document-signing-disclosure.tsx | 2 +- .../document-signing/document-signing-dropdown-field.tsx | 2 +- .../document-signing/document-signing-email-field.tsx | 3 ++- .../document-signing/document-signing-field-container.tsx | 2 +- .../general/document-signing/document-signing-form.tsx | 2 +- .../document-signing/document-signing-initials-field.tsx | 3 ++- .../document-signing/document-signing-name-field.tsx | 3 ++- .../document-signing/document-signing-number-field.tsx | 3 ++- .../general/document-signing/document-signing-page-view.tsx | 2 +- .../document-signing/document-signing-radio-field.tsx | 2 +- .../document-signing/document-signing-reject-dialog.tsx | 3 ++- .../document-signing/document-signing-signature-field.tsx | 3 ++- .../document-signing/document-signing-text-field.tsx | 3 ++- .../general/document/document-audit-log-download-button.tsx | 3 ++- .../document/document-certificate-download-button.tsx | 3 ++- .../app/components/general/document/document-edit-form.tsx | 2 +- .../components/general/document/document-history-sheet.tsx | 2 +- .../general/document/document-page-view-button.tsx | 3 ++- .../general/document/document-page-view-dropdown.tsx | 3 ++- .../general/document/document-page-view-information.tsx | 3 ++- .../general/document/document-page-view-recent-activity.tsx | 3 ++- .../general/document/document-page-view-recipients.tsx | 3 ++- .../general/document/document-read-only-fields.tsx | 2 +- .../document/document-recipient-link-copy-dialog.tsx | 3 ++- .../app/components/general/document/document-search.tsx | 2 +- .../app/components/general/document/document-status.tsx | 2 +- .../app/components/general/document/document-upload.tsx | 3 ++- apps/remix/app/components/general/generic-error-layout.tsx | 3 ++- apps/remix/app/components/general/menu-switcher.tsx | 3 ++- .../app/components/general/multiselect-role-combobox.tsx | 2 +- apps/remix/app/components/general/period-selector.tsx | 2 +- apps/remix/app/components/general/settings-nav-desktop.tsx | 2 +- apps/remix/app/components/general/settings-nav-mobile.tsx | 2 +- .../app/components/general/stack-avatars-with-tooltip.tsx | 2 +- .../components/general/teams/team-billing-portal-button.tsx | 3 ++- .../app/components/general/teams/team-email-dropdown.tsx | 3 ++- .../components/general/teams/team-layout-billing-banner.tsx | 3 ++- .../components/general/teams/team-settings-nav-desktop.tsx | 2 +- .../components/general/teams/team-settings-nav-mobile.tsx | 2 +- .../app/components/general/teams/team-transfer-status.tsx | 3 ++- .../general/template/template-direct-link-badge.tsx | 3 ++- .../app/components/general/template/template-edit-form.tsx | 2 +- .../general/template/template-page-view-documents-table.tsx | 3 ++- .../general/template/template-page-view-information.tsx | 3 ++- .../general/template/template-page-view-recent-activity.tsx | 2 +- .../general/template/template-page-view-recipients.tsx | 3 ++- .../remix/app/components/general/template/template-type.tsx | 2 +- .../components/general/upcoming-profile-claim-teaser.tsx | 2 +- apps/remix/app/components/general/user-profile-skeleton.tsx | 2 +- apps/remix/app/components/general/user-profile-timur.tsx | 2 +- apps/remix/app/components/general/verify-email-banner.tsx | 3 ++- .../app/components/general/webhook-multiselect-combobox.tsx | 2 +- .../app/components/tables/admin-dashboard-users-table.tsx | 2 +- .../tables/admin-document-recipient-item-table.tsx | 3 ++- .../remix/app/components/tables/admin-leaderboard-table.tsx | 2 +- apps/remix/app/components/tables/document-logs-table.tsx | 2 +- .../app/components/tables/documents-table-action-button.tsx | 3 ++- .../components/tables/documents-table-action-dropdown.tsx | 3 ++- .../app/components/tables/documents-table-empty-state.tsx | 2 +- .../app/components/tables/documents-table-sender-filter.tsx | 3 ++- apps/remix/app/components/tables/documents-table.tsx | 2 +- .../app/components/tables/internal-audit-log-table.tsx | 2 +- .../tables/settings-public-profile-templates-table.tsx | 3 ++- .../components/tables/settings-security-activity-table.tsx | 2 +- .../tables/settings-security-passkey-table-actions.tsx | 3 ++- .../components/tables/settings-security-passkey-table.tsx | 2 +- .../tables/team-settings-billing-invoices-table.tsx | 3 ++- .../tables/team-settings-member-invites-table.tsx | 3 ++- .../app/components/tables/team-settings-members-table.tsx | 3 ++- .../components/tables/templates-table-action-dropdown.tsx | 2 +- apps/remix/app/components/tables/templates-table.tsx | 3 ++- .../components/tables/user-settings-current-teams-table.tsx | 3 ++- .../tables/user-settings-pending-teams-table-actions.tsx | 3 ++- .../components/tables/user-settings-pending-teams-table.tsx | 2 +- .../components/tables/user-settings-teams-page-table.tsx | 3 ++- apps/remix/app/routes/_authenticated+/admin+/_layout.tsx | 2 +- .../app/routes/_authenticated+/admin+/documents.$id.tsx | 3 ++- .../app/routes/_authenticated+/admin+/documents._index.tsx | 4 ++-- .../remix/app/routes/_authenticated+/admin+/leaderboard.tsx | 2 +- .../app/routes/_authenticated+/admin+/site-settings.tsx | 3 ++- apps/remix/app/routes/_authenticated+/admin+/stats.tsx | 3 ++- .../app/routes/_authenticated+/admin+/subscriptions.tsx | 2 +- apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx | 3 ++- .../app/routes/_authenticated+/admin+/users._index.tsx | 2 +- .../app/routes/_authenticated+/documents+/$id._index.tsx | 2 +- .../app/routes/_authenticated+/documents+/$id.edit.tsx | 2 +- .../app/routes/_authenticated+/documents+/$id.logs.tsx | 3 ++- apps/remix/app/routes/_authenticated+/documents+/_index.tsx | 2 +- .../app/routes/_authenticated+/documents+/todo-loading.tsx | 2 +- apps/remix/app/routes/_authenticated+/settings+/_layout.tsx | 2 +- apps/remix/app/routes/_authenticated+/settings+/profile.tsx | 2 +- .../_authenticated+/settings+/public-profile+/index.tsx | 3 ++- .../_authenticated+/settings+/security+/activity+/index.tsx | 2 +- .../routes/_authenticated+/settings+/security+/index.tsx | 3 ++- .../_authenticated+/settings+/security+/passkeys+/index.tsx | 2 +- .../app/routes/_authenticated+/settings+/teams+/index.tsx | 2 +- .../_authenticated+/settings+/teams+/team-email-usage.tsx | 3 ++- .../_authenticated+/settings+/teams+/team-invitations.tsx | 3 ++- .../app/routes/_authenticated+/settings+/tokens+/index.tsx | 2 +- .../app/routes/_authenticated+/settings+/webhooks+/$id.tsx | 3 ++- .../routes/_authenticated+/settings+/webhooks+/index.tsx | 6 ++---- .../app/routes/_authenticated+/t.$teamUrl+/_layout.tsx | 3 ++- .../routes/_authenticated+/t.$teamUrl+/settings+/_index.tsx | 2 +- .../_authenticated+/t.$teamUrl+/settings+/_layout.tsx | 2 +- .../_authenticated+/t.$teamUrl+/settings+/billing.tsx | 3 ++- .../_authenticated+/t.$teamUrl+/settings+/members.tsx | 3 ++- .../_authenticated+/t.$teamUrl+/settings+/preferences.tsx | 2 +- .../routes/_authenticated+/t.$teamUrl+/settings+/tokens.tsx | 2 +- .../_authenticated+/t.$teamUrl+/settings+/webhooks.$id.tsx | 3 ++- .../_authenticated+/t.$teamUrl+/settings+/webhooks.tsx | 6 ++---- .../app/routes/_authenticated+/templates+/$id._index.tsx | 2 +- .../app/routes/_authenticated+/templates+/$id.edit.tsx | 2 +- apps/remix/app/routes/_authenticated+/templates+/_index.tsx | 2 +- .../app/routes/_internal+/[__htmltopdf]+/audit-log.tsx | 2 +- .../app/routes/_internal+/[__htmltopdf]+/certificate.tsx | 2 +- apps/remix/app/routes/_profile+/_layout.tsx | 2 +- apps/remix/app/routes/_profile+/p.$url.tsx | 2 +- apps/remix/app/routes/_recipient+/_layout.tsx | 2 +- apps/remix/app/routes/_recipient+/d.$token+/_index.tsx | 2 +- apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx | 2 +- apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx | 3 ++- apps/remix/app/routes/_recipient+/sign.$token+/rejected.tsx | 2 +- apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx | 2 +- .../_unauthenticated+/articles.signature-disclosure.tsx | 2 +- apps/remix/app/routes/_unauthenticated+/check-email.tsx | 2 +- apps/remix/app/routes/_unauthenticated+/forgot-password.tsx | 2 +- .../app/routes/_unauthenticated+/reset-password.$token.tsx | 2 +- apps/remix/app/routes/_unauthenticated+/reset-password.tsx | 2 +- apps/remix/app/routes/_unauthenticated+/signin.tsx | 2 +- .../app/routes/_unauthenticated+/team.decline.$token.tsx | 2 +- .../app/routes/_unauthenticated+/team.invite.$token.tsx | 2 +- .../routes/_unauthenticated+/team.verify.email.$token.tsx | 2 +- .../routes/_unauthenticated+/team.verify.transfer.token.tsx | 2 +- .../app/routes/_unauthenticated+/unverified-account.tsx | 2 +- .../app/routes/_unauthenticated+/verify-email.$token.tsx | 3 ++- apps/remix/app/routes/_unauthenticated+/verify-email.tsx | 2 +- 208 files changed, 325 insertions(+), 216 deletions(-) diff --git a/apps/remix/app/components/dialogs/account-delete-dialog.tsx b/apps/remix/app/components/dialogs/account-delete-dialog.tsx index cd8cd3199..5c528dfc4 100644 --- a/apps/remix/app/components/dialogs/account-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/account-delete-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { authClient } from '@documenso/auth/client'; import { useSession } from '@documenso/lib/client-only/providers/session'; diff --git a/apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx b/apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx index 6d4391d39..26692fedb 100644 --- a/apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Document } from '@prisma/client'; import { useNavigate } from 'react-router'; diff --git a/apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx b/apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx index f1dc14b70..58ffa9c85 100644 --- a/apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { User } from '@prisma/client'; import { useNavigate } from 'react-router'; import { match } from 'ts-pattern'; diff --git a/apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx b/apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx index 9f822263d..ee42931a9 100644 --- a/apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx +++ b/apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { User } from '@prisma/client'; import { match } from 'ts-pattern'; diff --git a/apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx b/apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx index 8104d7b33..1718c9e97 100644 --- a/apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx +++ b/apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { User } from '@prisma/client'; import { match } from 'ts-pattern'; diff --git a/apps/remix/app/components/dialogs/create-passkey-dialog.tsx b/apps/remix/app/components/dialogs/create-passkey-dialog.tsx index 2839dfa6a..d454ac834 100644 --- a/apps/remix/app/components/dialogs/create-passkey-dialog.tsx +++ b/apps/remix/app/components/dialogs/create-passkey-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { startRegistration } from '@simplewebauthn/browser'; import { KeyRoundIcon } from 'lucide-react'; diff --git a/apps/remix/app/components/dialogs/document-delete-dialog.tsx b/apps/remix/app/components/dialogs/document-delete-dialog.tsx index d76d99654..a169686a6 100644 --- a/apps/remix/app/components/dialogs/document-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/document-delete-dialog.tsx @@ -1,7 +1,8 @@ import { useEffect, useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { DocumentStatus } from '@prisma/client'; import { match } from 'ts-pattern'; diff --git a/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx b/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx index b841fb839..cb8ccfbb1 100644 --- a/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx +++ b/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx @@ -1,5 +1,6 @@ -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useNavigate } from 'react-router'; import { formatDocumentsPath } from '@documenso/lib/utils/teams'; diff --git a/apps/remix/app/components/dialogs/document-move-dialog.tsx b/apps/remix/app/components/dialogs/document-move-dialog.tsx index 1ae1334c4..afde845fa 100644 --- a/apps/remix/app/components/dialogs/document-move-dialog.tsx +++ b/apps/remix/app/components/dialogs/document-move-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { formatAvatarUrl } from '@documenso/lib/utils/avatars'; import { trpc } from '@documenso/trpc/react'; diff --git a/apps/remix/app/components/dialogs/document-resend-dialog.tsx b/apps/remix/app/components/dialogs/document-resend-dialog.tsx index d6df1ca19..bcd1d61a3 100644 --- a/apps/remix/app/components/dialogs/document-resend-dialog.tsx +++ b/apps/remix/app/components/dialogs/document-resend-dialog.tsx @@ -1,8 +1,9 @@ import { useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Team } from '@prisma/client'; import { type Document, type Recipient, SigningStatus } from '@prisma/client'; import { History } from 'lucide-react'; diff --git a/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx b/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx index 7d9b0e669..d6a13f456 100644 --- a/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx +++ b/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useMemo, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Plural, Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Plural, Trans } from '@lingui/react/macro'; import type { Template, TemplateDirectLink } from '@prisma/client'; import { TemplateType } from '@prisma/client'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; diff --git a/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx b/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx index fb49cca7b..038c78504 100644 --- a/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx @@ -1,7 +1,8 @@ import { useMemo, useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { AnimatePresence, motion } from 'framer-motion'; import { Loader, TagIcon } from 'lucide-react'; diff --git a/apps/remix/app/components/dialogs/team-create-dialog.tsx b/apps/remix/app/components/dialogs/team-create-dialog.tsx index 8531a2daa..a40a52850 100644 --- a/apps/remix/app/components/dialogs/team-create-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-create-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { useForm } from 'react-hook-form'; import { useSearchParams } from 'react-router'; diff --git a/apps/remix/app/components/dialogs/team-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-delete-dialog.tsx index 3f1a40587..b297cbb2a 100644 --- a/apps/remix/app/components/dialogs/team-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-delete-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { useNavigate } from 'react-router'; import { z } from 'zod'; diff --git a/apps/remix/app/components/dialogs/team-email-add-dialog.tsx b/apps/remix/app/components/dialogs/team-email-add-dialog.tsx index ae80cff51..2aee969ca 100644 --- a/apps/remix/app/components/dialogs/team-email-add-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-email-add-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { Plus } from 'lucide-react'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx index 21f0c0503..b9675f4a5 100644 --- a/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Prisma } from '@prisma/client'; import { formatAvatarUrl } from '@documenso/lib/utils/avatars'; diff --git a/apps/remix/app/components/dialogs/team-email-update-dialog.tsx b/apps/remix/app/components/dialogs/team-email-update-dialog.tsx index ccab54733..6958dc64d 100644 --- a/apps/remix/app/components/dialogs/team-email-update-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-email-update-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } 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'; diff --git a/apps/remix/app/components/dialogs/team-leave-dialog.tsx b/apps/remix/app/components/dialogs/team-leave-dialog.tsx index 883d42a6e..a6b6246a6 100644 --- a/apps/remix/app/components/dialogs/team-leave-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-leave-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { TeamMemberRole } from '@prisma/client'; import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; diff --git a/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx index 3493cfa77..dedda2003 100644 --- a/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { trpc } from '@documenso/trpc/react'; import { Alert } from '@documenso/ui/primitives/alert'; diff --git a/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx b/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx index 91b74bf2c..d7986b199 100644 --- a/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useRef, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { TeamMemberRole } from '@prisma/client'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { Download, Mail, MailIcon, PlusCircle, Trash, Upload, UsersIcon } from 'lucide-react'; diff --git a/apps/remix/app/components/dialogs/team-member-update-dialog.tsx b/apps/remix/app/components/dialogs/team-member-update-dialog.tsx index d8cd4c703..e9c3a021b 100644 --- a/apps/remix/app/components/dialogs/team-member-update-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-member-update-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { TeamMemberRole } from '@prisma/client'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/dialogs/team-transfer-dialog.tsx b/apps/remix/app/components/dialogs/team-transfer-dialog.tsx index b990829b8..6205edcb1 100644 --- a/apps/remix/app/components/dialogs/team-transfer-dialog.tsx +++ b/apps/remix/app/components/dialogs/team-transfer-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { Loader } from 'lucide-react'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; diff --git a/apps/remix/app/components/dialogs/template-create-dialog.tsx b/apps/remix/app/components/dialogs/template-create-dialog.tsx index a69ffec76..01f7a573e 100644 --- a/apps/remix/app/components/dialogs/template-create-dialog.tsx +++ b/apps/remix/app/components/dialogs/template-create-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { FilePlus, Loader } from 'lucide-react'; import { useNavigate } from 'react-router'; diff --git a/apps/remix/app/components/dialogs/template-delete-dialog.tsx b/apps/remix/app/components/dialogs/template-delete-dialog.tsx index 73642a201..7f821d4a3 100644 --- a/apps/remix/app/components/dialogs/template-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/template-delete-dialog.tsx @@ -1,5 +1,6 @@ -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { trpc as trpcReact } from '@documenso/trpc/react'; import { Button } from '@documenso/ui/primitives/button'; diff --git a/apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx b/apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx index 7472349bf..60ff06715 100644 --- a/apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx +++ b/apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { Trans } from '@lingui/macro'; +import { Trans } from '@lingui/react/macro'; import type { Recipient, Template, TemplateDirectLink } from '@prisma/client'; import { LinkIcon } from 'lucide-react'; diff --git a/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx b/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx index 1345e7803..2c05cb338 100644 --- a/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx +++ b/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx @@ -1,7 +1,8 @@ import { useEffect, useMemo, useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { type Recipient, RecipientRole, diff --git a/apps/remix/app/components/dialogs/template-duplicate-dialog.tsx b/apps/remix/app/components/dialogs/template-duplicate-dialog.tsx index cbfeb9488..1e999129f 100644 --- a/apps/remix/app/components/dialogs/template-duplicate-dialog.tsx +++ b/apps/remix/app/components/dialogs/template-duplicate-dialog.tsx @@ -1,5 +1,6 @@ -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { trpc as trpcReact } from '@documenso/trpc/react'; import { Button } from '@documenso/ui/primitives/button'; diff --git a/apps/remix/app/components/dialogs/template-move-dialog.tsx b/apps/remix/app/components/dialogs/template-move-dialog.tsx index 290db98fd..f113317eb 100644 --- a/apps/remix/app/components/dialogs/template-move-dialog.tsx +++ b/apps/remix/app/components/dialogs/template-move-dialog.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { match } from 'ts-pattern'; import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; diff --git a/apps/remix/app/components/dialogs/template-use-dialog.tsx b/apps/remix/app/components/dialogs/template-use-dialog.tsx index 40f8a73f4..8225afc84 100644 --- a/apps/remix/app/components/dialogs/template-use-dialog.tsx +++ b/apps/remix/app/components/dialogs/template-use-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Recipient } from '@prisma/client'; import { DocumentDistributionMethod, DocumentSigningOrder } from '@prisma/client'; import { InfoIcon, Plus, Upload, X } from 'lucide-react'; diff --git a/apps/remix/app/components/dialogs/token-delete-dialog.tsx b/apps/remix/app/components/dialogs/token-delete-dialog.tsx index 88eecdb3f..8b373d370 100644 --- a/apps/remix/app/components/dialogs/token-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/token-delete-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { ApiToken } from '@prisma/client'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; diff --git a/apps/remix/app/components/dialogs/webhook-create-dialog.tsx b/apps/remix/app/components/dialogs/webhook-create-dialog.tsx index c34d77313..32f16045c 100644 --- a/apps/remix/app/components/dialogs/webhook-create-dialog.tsx +++ b/apps/remix/app/components/dialogs/webhook-create-dialog.tsx @@ -1,8 +1,9 @@ import { useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { useForm } from 'react-hook-form'; import type { z } from 'zod'; diff --git a/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx b/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx index 9d6fb594f..5842f4fb7 100644 --- a/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx +++ b/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Webhook } from '@prisma/client'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; diff --git a/apps/remix/app/components/embed/embed-authentication-required.tsx b/apps/remix/app/components/embed/embed-authentication-required.tsx index 08bd0696b..11d672cb4 100644 --- a/apps/remix/app/components/embed/embed-authentication-required.tsx +++ b/apps/remix/app/components/embed/embed-authentication-required.tsx @@ -1,4 +1,4 @@ -import { Trans } from '@lingui/macro'; +import { Trans } from '@lingui/react/macro'; import { Alert, AlertDescription } from '@documenso/ui/primitives/alert'; diff --git a/apps/remix/app/components/embed/embed-direct-template-client-page.tsx b/apps/remix/app/components/embed/embed-direct-template-client-page.tsx index 05d903364..0da38634c 100644 --- a/apps/remix/app/components/embed/embed-direct-template-client-page.tsx +++ b/apps/remix/app/components/embed/embed-direct-template-client-page.tsx @@ -1,7 +1,8 @@ import { useEffect, useLayoutEffect, useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { type DocumentData, type Field, FieldType } from '@prisma/client'; import type { DocumentMeta, Recipient, Signature, TemplateMeta } from '@prisma/client'; import { LucideChevronDown, LucideChevronUp } from 'lucide-react'; diff --git a/apps/remix/app/components/embed/embed-document-completed.tsx b/apps/remix/app/components/embed/embed-document-completed.tsx index 163406563..ed83cdfe8 100644 --- a/apps/remix/app/components/embed/embed-document-completed.tsx +++ b/apps/remix/app/components/embed/embed-document-completed.tsx @@ -1,4 +1,4 @@ -import { Trans } from '@lingui/macro'; +import { Trans } from '@lingui/react/macro'; import type { Signature } from '@prisma/client'; import signingCelebration from '@documenso/assets/images/signing-celebration.png'; diff --git a/apps/remix/app/components/embed/embed-document-signing-page.tsx b/apps/remix/app/components/embed/embed-document-signing-page.tsx index 22ef78942..9b6abbd4a 100644 --- a/apps/remix/app/components/embed/embed-document-signing-page.tsx +++ b/apps/remix/app/components/embed/embed-document-signing-page.tsx @@ -1,7 +1,8 @@ import { useEffect, useLayoutEffect, useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { DocumentMeta, Recipient, TemplateMeta } from '@prisma/client'; import { type DocumentData, type Field, FieldType } from '@prisma/client'; import { LucideChevronDown, LucideChevronUp } from 'lucide-react'; diff --git a/apps/remix/app/components/forms/2fa/disable-authenticator-app-dialog.tsx b/apps/remix/app/components/forms/2fa/disable-authenticator-app-dialog.tsx index 1f72013eb..b4d623c0c 100644 --- a/apps/remix/app/components/forms/2fa/disable-authenticator-app-dialog.tsx +++ b/apps/remix/app/components/forms/2fa/disable-authenticator-app-dialog.tsx @@ -1,8 +1,9 @@ import { useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { flushSync } from 'react-dom'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx b/apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx index 67167771c..6d7ffb345 100644 --- a/apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx +++ b/apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { renderSVG } from 'uqr'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/2fa/recovery-code-list.tsx b/apps/remix/app/components/forms/2fa/recovery-code-list.tsx index 2b72883f2..d45f71227 100644 --- a/apps/remix/app/components/forms/2fa/recovery-code-list.tsx +++ b/apps/remix/app/components/forms/2fa/recovery-code-list.tsx @@ -1,4 +1,4 @@ -import { msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import { Copy } from 'lucide-react'; diff --git a/apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx b/apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx index fe62c2265..317dd62d9 100644 --- a/apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx +++ b/apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans } from '@lingui/macro'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { match } from 'ts-pattern'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/avatar-image.tsx b/apps/remix/app/components/forms/avatar-image.tsx index 9d2b97a54..dc8881f7b 100644 --- a/apps/remix/app/components/forms/avatar-image.tsx +++ b/apps/remix/app/components/forms/avatar-image.tsx @@ -1,8 +1,9 @@ import { useMemo } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { ErrorCode, useDropzone } from 'react-dropzone'; import { useForm } from 'react-hook-form'; import { useRevalidator } from 'react-router'; diff --git a/apps/remix/app/components/forms/forgot-password.tsx b/apps/remix/app/components/forms/forgot-password.tsx index 82cfab41d..ffc9b356e 100644 --- a/apps/remix/app/components/forms/forgot-password.tsx +++ b/apps/remix/app/components/forms/forgot-password.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { useNavigate } from 'react-router'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/password.tsx b/apps/remix/app/components/forms/password.tsx index 86dc3cd4b..7f4bb0d5c 100644 --- a/apps/remix/app/components/forms/password.tsx +++ b/apps/remix/app/components/forms/password.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { User } from '@prisma/client'; import { useForm } from 'react-hook-form'; import { match } from 'ts-pattern'; diff --git a/apps/remix/app/components/forms/profile.tsx b/apps/remix/app/components/forms/profile.tsx index 2f158fda2..cd1a0af73 100644 --- a/apps/remix/app/components/forms/profile.tsx +++ b/apps/remix/app/components/forms/profile.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/public-profile-claim-dialog.tsx b/apps/remix/app/components/forms/public-profile-claim-dialog.tsx index d08361e0d..f5e55e2ef 100644 --- a/apps/remix/app/components/forms/public-profile-claim-dialog.tsx +++ b/apps/remix/app/components/forms/public-profile-claim-dialog.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import type { User } from '@prisma/client'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/forms/public-profile-form.tsx b/apps/remix/app/components/forms/public-profile-form.tsx index 1cec987cf..6903fc1f9 100644 --- a/apps/remix/app/components/forms/public-profile-form.tsx +++ b/apps/remix/app/components/forms/public-profile-form.tsx @@ -1,8 +1,9 @@ import { useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Plural, Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Plural, Trans } from '@lingui/react/macro'; import type { TeamProfile, UserProfile } from '@prisma/client'; import { motion } from 'framer-motion'; import { AnimatePresence } from 'framer-motion'; diff --git a/apps/remix/app/components/forms/reset-password.tsx b/apps/remix/app/components/forms/reset-password.tsx index 91e10528d..a8b3deb2d 100644 --- a/apps/remix/app/components/forms/reset-password.tsx +++ b/apps/remix/app/components/forms/reset-password.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { match } from 'ts-pattern'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/send-confirmation-email.tsx b/apps/remix/app/components/forms/send-confirmation-email.tsx index ddf766116..a8e043340 100644 --- a/apps/remix/app/components/forms/send-confirmation-email.tsx +++ b/apps/remix/app/components/forms/send-confirmation-email.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; diff --git a/apps/remix/app/components/forms/signin.tsx b/apps/remix/app/components/forms/signin.tsx index 9b8452043..5ea9a46f3 100644 --- a/apps/remix/app/components/forms/signin.tsx +++ b/apps/remix/app/components/forms/signin.tsx @@ -1,8 +1,9 @@ import { useEffect, useMemo, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { browserSupportsWebAuthn, startAuthentication } from '@simplewebauthn/browser'; import { KeyRoundIcon } from 'lucide-react'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/forms/signup.tsx b/apps/remix/app/components/forms/signup.tsx index 0cf100f78..7981a9243 100644 --- a/apps/remix/app/components/forms/signup.tsx +++ b/apps/remix/app/components/forms/signup.tsx @@ -2,8 +2,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; import type { MessageDescriptor } from '@lingui/core'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { AnimatePresence, motion } from 'framer-motion'; import { useForm } from 'react-hook-form'; import { FaIdCardClip } from 'react-icons/fa6'; diff --git a/apps/remix/app/components/forms/team-branding-preferences-form.tsx b/apps/remix/app/components/forms/team-branding-preferences-form.tsx index 14f6ef66b..8136314c4 100644 --- a/apps/remix/app/components/forms/team-branding-preferences-form.tsx +++ b/apps/remix/app/components/forms/team-branding-preferences-form.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Team, TeamGlobalSettings } from '@prisma/client'; import { Loader } from 'lucide-react'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/forms/team-document-preferences-form.tsx b/apps/remix/app/components/forms/team-document-preferences-form.tsx index 0e74f2581..98701b36b 100644 --- a/apps/remix/app/components/forms/team-document-preferences-form.tsx +++ b/apps/remix/app/components/forms/team-document-preferences-form.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Team, TeamGlobalSettings } from '@prisma/client'; import { DocumentVisibility } from '@prisma/client'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/forms/team-update-form.tsx b/apps/remix/app/components/forms/team-update-form.tsx index fb9e9b761..2eaf5d30b 100644 --- a/apps/remix/app/components/forms/team-update-form.tsx +++ b/apps/remix/app/components/forms/team-update-form.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { AnimatePresence, motion } from 'framer-motion'; import { useForm } from 'react-hook-form'; import { useNavigate } from 'react-router'; diff --git a/apps/remix/app/components/forms/token.tsx b/apps/remix/app/components/forms/token.tsx index c20536ba3..41ce41bf3 100644 --- a/apps/remix/app/components/forms/token.tsx +++ b/apps/remix/app/components/forms/token.tsx @@ -1,8 +1,9 @@ import { useState, useTransition } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { ApiToken } from '@prisma/client'; import { AnimatePresence, motion } from 'framer-motion'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/general/app-command-menu.tsx b/apps/remix/app/components/general/app-command-menu.tsx index 05b31cd98..ed042d2ea 100644 --- a/apps/remix/app/components/general/app-command-menu.tsx +++ b/apps/remix/app/components/general/app-command-menu.tsx @@ -1,8 +1,9 @@ import { useCallback, useMemo, useState } from 'react'; import type { MessageDescriptor } from '@lingui/core'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { CheckIcon, Loader, Monitor, Moon, Sun } from 'lucide-react'; import { useHotkeys } from 'react-hotkeys-hook'; import { useNavigate } from 'react-router'; diff --git a/apps/remix/app/components/general/app-nav-desktop.tsx b/apps/remix/app/components/general/app-nav-desktop.tsx index 787cf0e12..eaa0c0bf5 100644 --- a/apps/remix/app/components/general/app-nav-desktop.tsx +++ b/apps/remix/app/components/general/app-nav-desktop.tsx @@ -1,8 +1,9 @@ import type { HTMLAttributes } from 'react'; import { useEffect, useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { Search } from 'lucide-react'; import { Link, useLocation, useParams } from 'react-router'; diff --git a/apps/remix/app/components/general/app-nav-mobile.tsx b/apps/remix/app/components/general/app-nav-mobile.tsx index 6f8785c8e..0d48525e1 100644 --- a/apps/remix/app/components/general/app-nav-mobile.tsx +++ b/apps/remix/app/components/general/app-nav-mobile.tsx @@ -1,5 +1,6 @@ -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { Link, useParams } from 'react-router'; import LogoImage from '@documenso/assets/logo.png'; diff --git a/apps/remix/app/components/general/avatar-with-recipient.tsx b/apps/remix/app/components/general/avatar-with-recipient.tsx index 23aeeb0ca..f46287abf 100644 --- a/apps/remix/app/components/general/avatar-with-recipient.tsx +++ b/apps/remix/app/components/general/avatar-with-recipient.tsx @@ -1,4 +1,4 @@ -import { msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import type { Recipient } from '@prisma/client'; import { DocumentStatus } from '@prisma/client'; diff --git a/apps/remix/app/components/general/claim-account.tsx b/apps/remix/app/components/general/claim-account.tsx index ae84ea227..1b0c7ca2f 100644 --- a/apps/remix/app/components/general/claim-account.tsx +++ b/apps/remix/app/components/general/claim-account.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { useForm } from 'react-hook-form'; import { useNavigate } from 'react-router'; import { z } from 'zod'; diff --git a/apps/remix/app/components/general/direct-template/direct-template-configure-form.tsx b/apps/remix/app/components/general/direct-template/direct-template-configure-form.tsx index d24d49ec6..3e695781b 100644 --- a/apps/remix/app/components/general/direct-template/direct-template-configure-form.tsx +++ b/apps/remix/app/components/general/direct-template/direct-template-configure-form.tsx @@ -1,6 +1,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Recipient } from '@prisma/client'; import type { Field } from '@prisma/client'; import { useForm } from 'react-hook-form'; diff --git a/apps/remix/app/components/general/direct-template/direct-template-page.tsx b/apps/remix/app/components/general/direct-template/direct-template-page.tsx index 018747b23..4751cb780 100644 --- a/apps/remix/app/components/general/direct-template/direct-template-page.tsx +++ b/apps/remix/app/components/general/direct-template/direct-template-page.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import type { Field } from '@prisma/client'; import { type Recipient } from '@prisma/client'; diff --git a/apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx b/apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx index 43cc2f57a..5c292e941 100644 --- a/apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx +++ b/apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx @@ -1,7 +1,8 @@ import { useState } from 'react'; -import { Trans, msg } from '@lingui/macro'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { authClient } from '@documenso/auth/client'; import { Button } from '@documenso/ui/primitives/button'; diff --git a/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx b/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx index 5456ddc78..8a1df7a5e 100644 --- a/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx +++ b/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx @@ -1,6 +1,6 @@ import { useMemo, useState } from 'react'; -import { Trans } from '@lingui/macro'; +import { Trans } from '@lingui/react/macro'; import type { Field, Recipient, Signature } from '@prisma/client'; import { FieldType } from '@prisma/client'; import { DateTime } from 'luxon'; diff --git a/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx b/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx index e4dafebd5..4f8be2bba 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import { zodResolver } from '@hookform/resolvers/zod'; -import { Trans } from '@lingui/macro'; +import { Trans } from '@lingui/react/macro'; import { RecipientRole } from '@prisma/client'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; @@ -119,7 +119,6 @@ export const DocumentSigningAuth2FA = ({ )} -