setup localization for twenty-emails #9806
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "$schema": "https://json.schemastore.org/swcrc", | ||
| "jsc": { | ||
| "experimental": { | ||
| "plugins": [ | ||
| [ | ||
| "@lingui/swc-plugin", | ||
| { | ||
| "runtimeModules": { | ||
| "i18n": ["@lingui/core", "i18n"], | ||
| "trans": ["@lingui/react", "Trans"] | ||
| } | ||
| } | ||
|
Comment on lines
+8
to
+13
There was a problem hiding this comment. style: indentation is inconsistent with the rest of the file (extra space before opening brace) |
||
| ] | ||
| ] | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import { defineConfig } from '@lingui/cli'; | ||
|
|
||
| export default defineConfig({ | ||
| sourceLocale: 'en', | ||
| locales: ['fr', 'en', 'pt', 'de', 'it', 'es', 'zh-Hans', 'zh-Hant'], | ||
| catalogs: [ | ||
| { | ||
| path: '<rootDir>/src/locales/{locale}/messages', | ||
| include: ['src'], | ||
| }, | ||
| ], | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,26 @@ | ||
| import { i18n } from '@lingui/core'; | ||
| import { I18nProvider } from '@lingui/react'; | ||
| import { Container, Html } from '@react-email/components'; | ||
| import { PropsWithChildren } from 'react'; | ||
|
|
||
| import { BaseHead } from 'src/components/BaseHead'; | ||
| import { Logo } from 'src/components/Logo'; | ||
|
|
||
| type BaseEmailProps = PropsWithChildren<{ | ||
| width?: number; | ||
| locale: string; | ||
| }>; | ||
|
|
||
| export const BaseEmail = ({ children, width, locale }: BaseEmailProps) => { | ||
| return ( | ||
|
There was a problem hiding this comment. logic: locale prop is now required but no default value provided - could cause runtime errors if not passed |
||
| <I18nProvider i18n={i18n}> | ||
| <Html lang={locale}> | ||
|
There was a problem hiding this comment. logic: i18n instance needs to be initialized and configured before being used in I18nProvider |
||
| <BaseHead /> | ||
| <Container width={width || 290}> | ||
| <Logo /> | ||
|
There was a problem hiding this comment. style: width default of 290 should be defined as a constant at the top level |
||
| {children} | ||
| </Container> | ||
| </Html> | ||
| </I18nProvider> | ||
| ); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,35 @@ | ||
| import { t } from '@lingui/core/macro'; | ||
| import { Trans } from '@lingui/react/macro'; | ||
| import { BaseEmail } from 'src/components/BaseEmail'; | ||
| import { CallToAction } from 'src/components/CallToAction'; | ||
| import { Link } from 'src/components/Link'; | ||
| import { MainText } from 'src/components/MainText'; | ||
| import { Title } from 'src/components/Title'; | ||
| import { loadAndActivateLocale } from 'src/utils/loadAndActivateLocale'; | ||
|
|
||
| type PasswordResetLinkEmailProps = { | ||
| duration: string; | ||
| link: string; | ||
| locale: string; | ||
| }; | ||
|
|
||
| export const PasswordResetLinkEmail = ({ | ||
| duration, | ||
| link, | ||
| locale, | ||
| }: PasswordResetLinkEmailProps) => { | ||
| loadAndActivateLocale(locale); | ||
|
|
||
| return ( | ||
| <BaseEmail locale={locale}> | ||
| <Title value={t`Reset your password 🗝`} /> | ||
|
There was a problem hiding this comment. style: The emoji in the title string may cause display issues in some email clients. Consider using a Unicode emoji or removing it for better compatibility. |
||
| <CallToAction href={link} value={t`Reset`} /> | ||
| <MainText> | ||
| <Trans> | ||
| This link is only valid for the next {duration}. If the link does not | ||
| work, you can use the login verification link directly: | ||
|
Comment on lines
+27
to
+28
There was a problem hiding this comment. style: The duration variable is not wrapped in a translation component, which is why it remains in English across all locales. Consider using a number + unit format that can be properly localized. |
||
| <br /> | ||
| </Trans> | ||
| <Link href={link} value={link} /> | ||
| </MainText> | ||
| </BaseEmail> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,49 @@ | ||
| import { i18n } from '@lingui/core'; | ||
| import { t } from '@lingui/core/macro'; | ||
| import { Trans } from '@lingui/react/macro'; | ||
|
|
||
| import { BaseEmail } from 'src/components/BaseEmail'; | ||
| import { CallToAction } from 'src/components/CallToAction'; | ||
| import { MainText } from 'src/components/MainText'; | ||
| import { Title } from 'src/components/Title'; | ||
| import { loadAndActivateLocale } from 'src/utils/loadAndActivateLocale'; | ||
|
|
||
| type PasswordUpdateNotifyEmailProps = { | ||
| userName: string; | ||
| email: string; | ||
| link: string; | ||
| locale: string; | ||
| }; | ||
|
|
||
| export const PasswordUpdateNotifyEmail = ({ | ||
| userName, | ||
| email, | ||
| link, | ||
| locale, | ||
| }: PasswordUpdateNotifyEmailProps) => { | ||
| loadAndActivateLocale(locale); | ||
|
|
||
| const helloString = userName?.length > 1 ? t`Dear ${userName}` : t`Dear`; | ||
| const formattedDate = i18n.date(new Date()); | ||
|
There was a problem hiding this comment. logic: string interpolation in t macro may not work as expected - consider using Trans component instead for variable interpolation |
||
|
|
||
|
There was a problem hiding this comment. style: i18n.date() needs date format options to ensure consistent formatting across locales |
||
| return ( | ||
| <BaseEmail locale={locale}> | ||
| <Title value={t`Password updated`} /> | ||
| <MainText> | ||
| {helloString}, | ||
| <br /> | ||
| <br /> | ||
| <Trans> | ||
| This is a confirmation that password for your account ({email}) was | ||
| successfully changed on {formattedDate}. | ||
| <br /> | ||
| <br /> | ||
| If you did not initiate this change, please contact your workspace | ||
| owner immediately. | ||
| </Trans> | ||
| <br /> | ||
| </MainText> | ||
| <CallToAction value={t`Connect to Twenty`} href={link} /> | ||
| </BaseEmail> | ||
| ); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,36 @@ | ||
| import { t } from '@lingui/core/macro'; | ||
| import { Trans } from '@lingui/react/macro'; | ||
|
|
||
| import { BaseEmail } from 'src/components/BaseEmail'; | ||
| import { CallToAction } from 'src/components/CallToAction'; | ||
| import { Footer } from 'src/components/Footer'; | ||
| import { MainText } from 'src/components/MainText'; | ||
| import { Title } from 'src/components/Title'; | ||
| import { loadAndActivateLocale } from 'src/utils/loadAndActivateLocale'; | ||
|
|
||
| type SendEmailVerificationLinkEmailProps = { | ||
| link: string; | ||
| locale: string; | ||
| }; | ||
|
|
||
| export const SendEmailVerificationLinkEmail = ({ | ||
| link, | ||
| locale, | ||
| }: SendEmailVerificationLinkEmailProps) => { | ||
| loadAndActivateLocale(locale); | ||
|
|
||
| return ( | ||
| <BaseEmail width={333} locale={locale}> | ||
| <Title value={t`Confirm your email address`} /> | ||
| <CallToAction href={link} value={t`Verify Email`} /> | ||
| <br /> | ||
| <br /> | ||
| <MainText> | ||
| <Trans> | ||
| Thanks for registering for an account on Twenty! Before we get | ||
| started, we just need to confirm that this is you. Click above to | ||
| verify your email address. | ||
| </Trans> | ||
| </MainText> | ||
| <Footer /> | ||
| </BaseEmail> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -1,3 +1,5 @@ | ||||||||
| import { t } from '@lingui/core/macro'; | ||||||||
| import { Trans } from '@lingui/react/macro'; | ||||||||
| import { Img } from '@react-email/components'; | ||||||||
| import { emailTheme } from 'src/common-style'; | ||||||||
|
|
||||||||
|
|
@@ -10,6 +12,7 @@ import { MainText } from 'src/components/MainText'; | |||||||
| import { Title } from 'src/components/Title'; | ||||||||
| import { WhatIsTwenty } from 'src/components/WhatIsTwenty'; | ||||||||
| import { capitalize } from 'src/utils/capitalize'; | ||||||||
| import { loadAndActivateLocale } from 'src/utils/loadAndActivateLocale'; | ||||||||
| import { getImageAbsoluteURI } from 'twenty-shared'; | ||||||||
|
|
||||||||
| type SendInviteLinkEmailProps = { | ||||||||
|
|
@@ -21,35 +24,40 @@ type SendInviteLinkEmailProps = { | |||||||
| lastName: string; | ||||||||
| }; | ||||||||
| serverUrl: string; | ||||||||
| locale: string; | ||||||||
| }; | ||||||||
|
|
||||||||
| export const SendInviteLinkEmail = ({ | ||||||||
| link, | ||||||||
| workspace, | ||||||||
| sender, | ||||||||
| serverUrl, | ||||||||
| locale, | ||||||||
| }: SendInviteLinkEmailProps) => { | ||||||||
| loadAndActivateLocale(locale); | ||||||||
|
|
||||||||
| const workspaceLogo = workspace.logo | ||||||||
| ? getImageAbsoluteURI({ imageUrl: workspace.logo, baseUrl: serverUrl }) | ||||||||
| : null; | ||||||||
|
|
||||||||
| return ( | ||||||||
| <BaseEmail width={333} locale={locale}> | ||||||||
| <Title value={t`Join your team on Twenty`} /> | ||||||||
| <MainText> | ||||||||
| {capitalize(sender.firstName)} ( | ||||||||
|
There was a problem hiding this comment. style: sender.firstName needs to be wrapped in t`` for translation since it's being capitalized |
||||||||
| <Link | ||||||||
| href={`mailto:${sender.email}`} | ||||||||
| value={sender.email} | ||||||||
| color={emailTheme.font.colors.blue} | ||||||||
| /> | ||||||||
| )<Trans>has invited you to join a workspace called </Trans> | ||||||||
| <b>{workspace.name}</b> | ||||||||
|
Comment on lines
+50
to
+51
There was a problem hiding this comment. style: text split between Trans component and workspace name may cause grammatical issues in languages with different word orders
Suggested change
|
||||||||
| <br /> | ||||||||
| </MainText> | ||||||||
| <HighlightedContainer> | ||||||||
| {workspaceLogo && <Img src={workspaceLogo} width={40} height={40} />} | ||||||||
| {workspace.name && <HighlightedText value={workspace.name} />} | ||||||||
| <CallToAction href={link} value={t`Accept invite`} /> | ||||||||
| </HighlightedContainer> | ||||||||
| <WhatIsTwenty /> | ||||||||
| </BaseEmail> | ||||||||
|
|
||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ export const WarnSuspendedWorkspaceEmail = ({ | |
| const helloString = userName?.length > 1 ? `Hello ${userName}` : 'Hello'; | ||
|
There was a problem hiding this comment. logic: 'Hello' string should be localized using Trans or t macro |
||
|
|
||
| return ( | ||
| <BaseEmail width={333} locale="en"> | ||
| <Title value="Suspended Workspace 😴" /> | ||
|
There was a problem hiding this comment. logic: title value should be localized using t macro |
||
| <MainText> | ||
| {helloString}, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| msgid "" | ||
| msgstr "" | ||
| "POT-Creation-Date: 2025-01-21 22:51+0530\n" | ||
|
There was a problem hiding this comment. logic: POT-Creation-Date is set to 2025-01-21, which is in the future. This should be the current date. |
||
| "MIME-Version: 1.0\n" | ||
| "Content-Type: text/plain; charset=utf-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "X-Generator: @lingui/cli\n" | ||
| "Language: de\n" | ||
| "Project-Id-Version: \n" | ||
| "Report-Msgid-Bugs-To: \n" | ||
| "PO-Revision-Date: \n" | ||
| "Last-Translator: \n" | ||
| "Language-Team: \n" | ||
| "Plural-Forms: \n" | ||
|
|
||
|
|
||
| #: src/emails/send-invite-link.email.tsx:60 | ||
| msgid "Accept invite" | ||
| msgstr "Einladung annehmen" | ||
|
|
||
| #: src/emails/send-email-verification-link.email.tsx:24 | ||
| msgid "Confirm your email address" | ||
| msgstr "Bestätigen Sie Ihre E-Mail-Adresse" | ||
|
|
||
| #: src/emails/password-update-notify.email.tsx:46 | ||
| msgid "Connect to Twenty" | ||
| msgstr "Verbinde dich mit Twenty" | ||
|
|
||
| #: src/emails/password-update-notify.email.tsx:26 | ||
| msgid "Dear" | ||
| msgstr "Sehr geehrte/r" | ||
|
|
||
| #: src/emails/password-update-notify.email.tsx:26 | ||
| msgid "Dear {userName}" | ||
| msgstr "Sehr geehrte/r {userName}" | ||
|
|
||
| #: src/emails/send-invite-link.email.tsx:53 | ||
| msgid "has invited you to join a workspace called " | ||
| msgstr "hat Sie eingeladen, einem Arbeitsbereich namens " | ||
|
|
||
| #: src/emails/send-invite-link.email.tsx:45 | ||
| msgid "Join your team on Twenty" | ||
| msgstr "Treten Sie Ihrem Team auf Twenty bei" | ||
|
|
||
| #: src/emails/password-update-notify.email.tsx:31 | ||
| msgid "Password updated" | ||
| msgstr "Passwort aktualisiert" | ||
|
|
||
| #: src/emails/password-reset-link.email.tsx:26 | ||
| msgid "Reset" | ||
| msgstr "Zurücksetzen" | ||
|
|
||
| #: src/emails/password-reset-link.email.tsx:25 | ||
| msgid "Reset your password 🗝" | ||
| msgstr "Setzen Sie Ihr Passwort zurück 🗝" | ||
|
|
||
| #: src/emails/send-email-verification-link.email.tsx:29 | ||
| msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address." | ||
| msgstr "Danke, dass Sie sich für ein Konto auf Twenty registriert haben! Bevor wir beginnen, müssen wir nur bestätigen, dass Sie es sind. Klicken Sie oben, um Ihre E-Mail-Adresse zu bestätigen." | ||
|
|
||
| #: src/emails/password-update-notify.email.tsx:36 | ||
| msgid "This is a confirmation that password for your account ({email}) was successfully changed on {formattedDate}.<0/><1/>If you did not initiate this change, please contact your workspace owner immediately." | ||
| msgstr "Dies ist eine Bestätigung, dass das Passwort für Ihr Konto ({email}) erfolgreich am {formattedDate} geändert wurde.<0/><1/>Wenn Sie diese Änderung nicht initiiert haben, kontaktieren Sie bitte sofort den Eigentümer Ihres Arbeitsbereichs." | ||
|
|
||
| #: src/emails/password-reset-link.email.tsx:28 | ||
| msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:<0/>" | ||
| msgstr "Dieser Link ist nur für die nächsten {duration} gültig. Wenn der Link nicht funktioniert, können Sie direkt den Login-Verifizierungslink verwenden:<0/>" | ||
|
There was a problem hiding this comment. style: The {duration} variable is not localized and will always appear in English as noted in the PR description. Consider using a localized duration format. |
||
|
|
||
| #: src/emails/send-email-verification-link.email.tsx:25 | ||
| msgid "Verify Email" | ||
| msgstr "E-Mail verifizieren" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"A7zEzZ\":[[\"daysLeft\",\"plural\",{\"one\":[\"Tag übrig\"],\"other\":[\"Tage übrig\"]}]],\"0JB+B5\":[[\"daysLeft\",\"plural\",{\"one\":[\"Keine Sorge! Erstellen oder bearbeiten Sie einfach einen Datensatz innerhalb des nächsten \",[\"remainingDays\"],\" Tages, um weiterhin Zugriff zu haben.\"],\"other\":[\"Keine Sorge! Erstellen oder bearbeiten Sie einfach einen Datensatz innerhalb der nächsten \",[\"remainingDays\"],\" Tage, um weiterhin Zugriff zu haben.\"]}]],\"4WPI3S\":[\"Einladung annehmen\"],\"RPHFhC\":[\"Bestätigen Sie Ihre E-Mail-Adresse\"],\"nvkBPN\":[\"Verbinde dich mit Twenty\"],\"791xh3\":[\"Inaktive Arbeitsbereiche 😵, die gelöscht werden sollten\"],\"JRzgV7\":[\"Sehr geehrte/r\"],\"Lm5BBI\":[\"Sehr geehrte/r \",[\"userName\"]],\"tGme7M\":[\"hat Sie eingeladen, einem Arbeitsbereich namens \"],\"uzTaYi\":[\"Hallo\"],\"r0OJlV\":[\"Hallo \",[\"userName\"]],\"vq4f+3\":[\"Inaktiver Arbeitsbereich 😴\"],\"Y4Nk3c\":[\"Es scheint eine Inaktivitätsperiode in Ihrem<0>\",[\"workspaceDisplayName\"],\"</0> Arbeitsbereich gegeben zu haben.<1/><2/>Bitte beachten Sie, dass das Konto bald deaktiviert wird und alle damit verbundenen Daten in diesem Arbeitsbereich gelöscht werden.<3/><4/>\"],\"PviVyk\":[\"Treten Sie Ihrem Team auf Twenty bei\"],\"ja42wz\":[\"Liste der <0>workspaceIds</0>, die seit mindestens <1>\",[\"minDaysSinceInactive\"],\" Tagen inaktiv sind:\"],\"ogtYkT\":[\"Passwort aktualisiert\"],\"OfhWJH\":[\"Zurücksetzen\"],\"RE5NiU\":[\"Setzen Sie Ihr Passwort zurück 🗝\"],\"7yDt8q\":[\"Danke, dass Sie sich für ein Konto auf Twenty registriert haben! Bevor wir beginnen, müssen wir nur bestätigen, dass Sie es sind. Klicken Sie oben, um Ihre E-Mail-Adresse zu bestätigen.\"],\"wSOsS+\":[\"Dies ist eine Bestätigung, dass das Passwort für Ihr Konto (\",[\"email\"],\") erfolgreich am \",[\"formattedDate\"],\" geändert wurde.<0/><1/>Wenn Sie diese Änderung nicht initiiert haben, kontaktieren Sie bitte sofort den Eigentümer Ihres Arbeitsbereichs.\"],\"RGs4CL\":[\"This link is only valid for the next \",[\"duration\"],\". If the link does not\\n work, you can use the login verification link directly:<0/>\"],\"2oA637\":[\"Dieser Link ist nur für die nächsten \",[\"duration\"],\" gültig. Wenn der Link nicht funktioniert, können Sie direkt den Login-Verifizierungslink verwenden:<0/>\"],\"wCKkSr\":[\"E-Mail verifizieren\"]}")as Messages; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see Babel in the emails folder. I think it's best to use SWC but it seemed to use Babel. But you didn't migrate twenty-emails to SWC here did you? I'm surprised it works. Want to take a shot at removing Babel?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I didn't migrated to SWC. I chose to go creating
.swcrcbecause thevite.config.tsalready imported React from@vitejs/plugin-react-swcI will remove babel and will check how it goes then.