The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: resolve internal pdf translations
David Nguyen5ce2bae39d48
diff --git a/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx b/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsxindex 6bd1d1161..2dd5fbe5e 100644--- a/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx+++ b/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx@@ -9,7 +9,7 @@ import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';import { findDocumentAuditLogs } from '@documenso/lib/server-only/document/find-document-audit-logs';-import { dynamicActivate } from '@documenso/lib/utils/i18n';+import { getTranslations } from '@documenso/lib/utils/i18n';import { Card, CardContent } from '@documenso/ui/primitives/card';import { BrandingLogo } from '~/components/general/branding-logo';@@ -49,10 +49,13 @@ export async function loader({ request }: Route.LoaderArgs) {perPage: 100_000,});+ const messages = await getTranslations(documentLanguage);+return {auditLogs,document,documentLanguage,+ messages,};}@@ -61,16 +64,15 @@ export async function loader({ request }: Route.LoaderArgs) {** Cannot use dynamicActivate by itself to translate this specific page and all* children components because `not-found.tsx` page runs and overrides the i18n.+ *+ * Update: Maybe <Trans> tags work now after RR7 migration.*/export default function AuditLog({ loaderData }: Route.ComponentProps) {- const { auditLogs, document, documentLanguage } = loaderData;-- const { i18n } = useLingui();+ const { auditLogs, document, documentLanguage, messages } = loaderData;- // Todo- void dynamicActivate(documentLanguage);+ const { i18n, _ } = useLingui();- const { _ } = useLingui();+ i18n.loadAndActivate({ locale: documentLanguage, messages });return (<div className="print-provider pointer-events-none mx-auto max-w-screen-md">diff --git a/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx b/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsxindex 4b21b6f35..bbfb8b9cd 100644--- a/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx+++ b/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx@@ -16,6 +16,7 @@ import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt'import { getDocumentCertificateAuditLogs } from '@documenso/lib/server-only/document/get-document-certificate-audit-logs';import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';+import { getTranslations } from '@documenso/lib/utils/i18n';import { Card, CardContent } from '@documenso/ui/primitives/card';import {Table,@@ -64,10 +65,13 @@ export async function loader({ request }: Route.LoaderArgs) {id: documentId,});+ const messages = await getTranslations(documentLanguage);+return {document,documentLanguage,auditLogs,+ messages,};}@@ -77,16 +81,15 @@ export async function loader({ request }: Route.LoaderArgs) {** Cannot use dynamicActivate by itself to translate this specific page and all* children components because `not-found.tsx` page runs and overrides the i18n.+ *+ * Update: Maybe <Trans> tags work now after RR7 migration.*/export default function SigningCertificate({ loaderData }: Route.ComponentProps) {- const { document, documentLanguage, auditLogs } = loaderData;-- const { i18n } = useLingui();+ const { document, documentLanguage, auditLogs, messages } = loaderData;- const { _ } = useLingui();+ const { i18n, _ } = useLingui();- // Todo- // dynamicActivate(i18n, documentLanguage);+ i18n.loadAndActivate({ locale: documentLanguage, messages });const isOwner = (email: string) => {return email.toLowerCase() === document.user.email.toLowerCase();diff --git a/packages/lib/utils/i18n.ts b/packages/lib/utils/i18n.tsindex 4ed4685a5..b2dd7e4f6 100644--- a/packages/lib/utils/i18n.ts+++ b/packages/lib/utils/i18n.ts@@ -5,11 +5,17 @@ import type { I18nLocaleData, SupportedLanguageCodes } from '../constants/i18n';import { APP_I18N_OPTIONS } from '../constants/i18n';import { env } from './env';-export async function dynamicActivate(locale: string) {+export async function getTranslations(locale: string) {const extension = env('NODE_ENV') === 'development' ? 'po' : 'mjs';const { messages } = await import(`../translations/${locale}/web.${extension}`);+ return messages;+}++export async function dynamicActivate(locale: string) {+ const messages = await getTranslations(locale);+i18n.loadAndActivate({ locale, messages });}