diff --git a/apps/remix/app/components/tables/internal-audit-log-table.tsx b/apps/remix/app/components/tables/internal-audit-log-table.tsx index addbb4174..393823ae5 100644 --- a/apps/remix/app/components/tables/internal-audit-log-table.tsx +++ b/apps/remix/app/components/tables/internal-audit-log-table.tsx @@ -1,5 +1,5 @@ -import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { DateTime } from 'luxon'; import type { DateTimeFormatOptions } from 'luxon'; import { UAParser } from 'ua-parser-js'; @@ -41,11 +41,21 @@ export const InternalAuditLogTable = ({ logs }: AuditLogDataTableProps) => { - {_(msg`Time`)} - {_(msg`User`)} - {_(msg`Action`)} - {_(msg`IP Address`)} - {_(msg`Browser`)} + + Time + + + User + + + Action + + + IP Address + + + Browser + diff --git a/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx b/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx index bb9d62c9a..215beccd2 100644 --- a/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx +++ b/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx @@ -1,5 +1,6 @@ import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { DateTime } from 'luxon'; import { redirect } from 'react-router'; @@ -77,25 +78,33 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) { return (
-

{_(msg`Version History`)}

+

+ Version History +

- {_(msg`Document ID`)} + + Document ID + {document.id}

- {_(msg`Enclosed Document`)} + + Enclosed Document + {document.title}

- {_(msg`Status`)} + + Status + {_( @@ -105,7 +114,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {

- {_(msg`Owner`)} + + Owner + {document.user.name} ({document.user.email}) @@ -113,7 +124,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {

- {_(msg`Created At`)} + + Created At + {DateTime.fromJSDate(document.createdAt) @@ -123,7 +136,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {

- {_(msg`Last Updated`)} + + Last Updated + {DateTime.fromJSDate(document.updatedAt) @@ -133,7 +148,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {

- {_(msg`Time Zone`)} + + Time Zone + {document.documentMeta?.timezone ?? 'N/A'} @@ -141,7 +158,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {

-

{_(msg`Recipients`)}

+

+ Recipients +

    {document.recipients.map((recipient) => ( diff --git a/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx b/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx index c415a0e13..5f513613a 100644 --- a/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx +++ b/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx @@ -1,5 +1,6 @@ import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import { FieldType, SigningStatus } from '@prisma/client'; import { DateTime } from 'luxon'; import { redirect } from 'react-router'; @@ -199,7 +200,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps) return (
    -

    {_(msg`Signing Certificate`)}

    +

    + Signing Certificate +

    @@ -207,9 +210,15 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
- {_(msg`Signer Events`)} - {_(msg`Signature`)} - {_(msg`Details`)} + + Signer Events + + + Signature + + + Details + {/* Security */} @@ -229,7 +238,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)

- {_(msg`Authentication Level`)}:{' '} + + Authentication Level: + {' '} {getAuthenticationLevel(recipient.id)}

@@ -259,7 +270,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)

- {_(msg`Signature ID`)}:{' '} + + Signature ID: + {' '} {signature.secondaryId} @@ -270,14 +283,18 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps) )}

- {_(msg`IP Address`)}:{' '} + + IP Address: + {' '} {logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.ipAddress ?? _(msg`Unknown`)}

- {_(msg`Device`)}:{' '} + + Device: + {' '} {getDevice(logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.userAgent)} @@ -287,7 +304,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)

- {_(msg`Sent`)}:{' '} + + Sent: + {' '} {logs.EMAIL_SENT[0] ? DateTime.fromJSDate(logs.EMAIL_SENT[0].createdAt) @@ -298,7 +317,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)

- {_(msg`Viewed`)}:{' '} + + Viewed: + {' '} {logs.DOCUMENT_OPENED[0] ? DateTime.fromJSDate(logs.DOCUMENT_OPENED[0].createdAt) @@ -310,7 +331,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps) {logs.DOCUMENT_RECIPIENT_REJECTED[0] ? (

- {_(msg`Rejected`)}:{' '} + + Rejected: + {' '} {logs.DOCUMENT_RECIPIENT_REJECTED[0] ? DateTime.fromJSDate(logs.DOCUMENT_RECIPIENT_REJECTED[0].createdAt) @@ -321,7 +344,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)

) : (

- {_(msg`Signed`)}:{' '} + + Signed: + {' '} {logs.DOCUMENT_RECIPIENT_COMPLETED[0] ? DateTime.fromJSDate( @@ -335,7 +360,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps) )}

- {_(msg`Reason`)}:{' '} + + Reason: + {' '} {recipient.signingStatus === SigningStatus.REJECTED ? recipient.rejectionReason @@ -371,7 +398,7 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)

- {_(msg`Signing certificate provided by`)}: + Signing certificate provided by:

diff --git a/apps/remix/app/routes/embed+/v1+/authoring+/document.create.tsx b/apps/remix/app/routes/embed+/v1+/authoring+/document.create.tsx index bf3c09e63..e4ad181eb 100644 --- a/apps/remix/app/routes/embed+/v1+/authoring+/document.create.tsx +++ b/apps/remix/app/routes/embed+/v1+/authoring+/document.create.tsx @@ -1,5 +1,6 @@ import { useLayoutEffect, useState } from 'react'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import { useNavigate } from 'react-router'; @@ -51,8 +52,8 @@ export default function EmbeddingAuthoringDocumentCreatePage() { if (!configuration || !configuration.documentData) { toast({ variant: 'destructive', - title: _('Error'), - description: _('Please configure the document first'), + title: _(msg`Error`), + description: _(msg`Please configure the document first`), }); return; @@ -103,8 +104,8 @@ export default function EmbeddingAuthoringDocumentCreatePage() { }); toast({ - title: _('Success'), - description: _('Document created successfully'), + title: _(msg`Success`), + description: _(msg`Document created successfully`), }); // Send a message to the parent window with the document details @@ -130,8 +131,8 @@ export default function EmbeddingAuthoringDocumentCreatePage() { toast({ variant: 'destructive', - title: _('Error'), - description: _('Failed to create document'), + title: _(msg`Error`), + description: _(msg`Failed to create document`), }); } }; diff --git a/apps/remix/app/routes/embed+/v1+/authoring+/template.create.tsx b/apps/remix/app/routes/embed+/v1+/authoring+/template.create.tsx index 372bc7265..43cc381ee 100644 --- a/apps/remix/app/routes/embed+/v1+/authoring+/template.create.tsx +++ b/apps/remix/app/routes/embed+/v1+/authoring+/template.create.tsx @@ -1,5 +1,6 @@ import { useLayoutEffect, useState } from 'react'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import { useNavigate } from 'react-router'; @@ -49,8 +50,8 @@ export default function EmbeddingAuthoringTemplateCreatePage() { if (!configuration || !configuration.documentData) { toast({ variant: 'destructive', - title: _('Error'), - description: _('Please configure the template first'), + title: _(msg`Error`), + description: _(msg`Please configure the template first`), }); return; @@ -93,8 +94,8 @@ export default function EmbeddingAuthoringTemplateCreatePage() { }); toast({ - title: _('Success'), - description: _('Template created successfully'), + title: _(msg`Success`), + description: _(msg`Template created successfully`), }); // Send a message to the parent window with the template details @@ -120,8 +121,8 @@ export default function EmbeddingAuthoringTemplateCreatePage() { toast({ variant: 'destructive', - title: _('Error'), - description: _('Failed to create template'), + title: _(msg`Error`), + description: _(msg`Failed to create template`), }); } }; diff --git a/packages/ui/components/document/document-download-button.tsx b/packages/ui/components/document/document-download-button.tsx index 51efefa96..d603f497f 100644 --- a/packages/ui/components/document/document-download-button.tsx +++ b/packages/ui/components/document/document-download-button.tsx @@ -1,6 +1,7 @@ import type { HTMLAttributes } from 'react'; import { useState } from 'react'; +import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import { Trans } from '@lingui/react/macro'; import type { DocumentData } from '@prisma/client'; @@ -45,8 +46,8 @@ export const DocumentDownloadButton = ({ setIsLoading(false); toast({ - title: _('Something went wrong'), - description: _('An error occurred while downloading your document.'), + title: _(msg`Something went wrong`), + description: _(msg`An error occurred while downloading your document.`), variant: 'destructive', }); } diff --git a/packages/ui/primitives/data-table-pagination.tsx b/packages/ui/primitives/data-table-pagination.tsx index c9722e217..fe018e92c 100644 --- a/packages/ui/primitives/data-table-pagination.tsx +++ b/packages/ui/primitives/data-table-pagination.tsx @@ -1,5 +1,3 @@ -import { msg } from '@lingui/core/macro'; -import { useLingui } from '@lingui/react'; import { Plural, Trans } from '@lingui/react/macro'; import type { Table } from '@tanstack/react-table'; import { ChevronLeft, ChevronRight, ChevronsLeft, ChevronsRight } from 'lucide-react'; @@ -23,8 +21,6 @@ export function DataTablePagination({ table, additionalInformation = 'VisibleCount', }: DataTablePaginationProps) { - const { _ } = useLingui(); - return (
@@ -90,7 +86,9 @@ export function DataTablePagination({ onClick={() => table.setPageIndex(0)} disabled={!table.getCanPreviousPage()} > - {_(msg`Go to first page`)} + + Go to first page +
diff --git a/packages/ui/primitives/data-table/data-table-faceted-filter.tsx b/packages/ui/primitives/data-table/data-table-faceted-filter.tsx index 35c81a8e0..76f10be25 100644 --- a/packages/ui/primitives/data-table/data-table-faceted-filter.tsx +++ b/packages/ui/primitives/data-table/data-table-faceted-filter.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import type { MessageDescriptor } from '@lingui/core'; import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; +import { Trans } from '@lingui/react/macro'; import type { Column } from '@tanstack/react-table'; import { Check } from 'lucide-react'; @@ -83,7 +84,9 @@ export function DataTableFacetedFilter({ - {_(msg`No results found.`)} + + No results found. + {options.map((option) => { const isSelected = selectedValuesSet.has(option.value); diff --git a/packages/ui/primitives/data-table/data-table-pagination.tsx b/packages/ui/primitives/data-table/data-table-pagination.tsx index 5ceb372ec..84003fcd1 100644 --- a/packages/ui/primitives/data-table/data-table-pagination.tsx +++ b/packages/ui/primitives/data-table/data-table-pagination.tsx @@ -1,3 +1,4 @@ +import { Trans } from '@lingui/react/macro'; import type { Table } from '@tanstack/react-table'; import { ChevronLeft, ChevronRight, ChevronsLeft, ChevronsRight } from 'lucide-react'; @@ -12,12 +13,16 @@ export function DataTablePagination({ table }: DataTablePaginationProps
- {table.getFilteredSelectedRowModel().rows.length} of{' '} - {table.getFilteredRowModel().rows.length} row(s) selected. + + {table.getFilteredSelectedRowModel().rows.length} of{' '} + {table.getFilteredRowModel().rows.length} row(s) selected. +
-

Rows per page

+

+ Rows per page +