Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix language switcher translations #68

Merged
merged 1 commit into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/common/AttendeeDetails/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Attendee} from "../../../types.ts";
import classes from "./AttendeeDetails.module.scss";
import {t} from "@lingui/macro";
import {getAttendeeTicketTitle} from "../../../utilites/tickets.ts";
import {localeToNameMap, SupportedLocales} from "../../../locales.ts";
import {getLocaleName, SupportedLocales} from "../../../locales.ts";

export const AttendeeDetails = ({attendee}: { attendee: Attendee }) => {
return (
Expand Down Expand Up @@ -54,7 +54,7 @@ export const AttendeeDetails = ({attendee}: { attendee: Attendee }) => {
{t`Language`}
</div>
<div className={classes.amount}>
{localeToNameMap[attendee.locale as SupportedLocales]}
{getLocaleName(attendee.locale as SupportedLocales)}
</div>
</div>
</Card>
Expand Down
11 changes: 9 additions & 2 deletions frontend/src/components/common/LanguageSwitcher/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import {Select} from "@mantine/core";
import {dynamicActivateLocale, getClientLocale, localeToNameMap, SupportedLocales} from "../../../locales.ts";
import {
dynamicActivateLocale,
getClientLocale,
getLocaleName,
localeToNameMap,
SupportedLocales
} from "../../../locales.ts";
import {t} from "@lingui/macro";
import {IconWorld} from "@tabler/icons-react";

Expand All @@ -13,13 +19,14 @@ export const LanguageSwitcher = () => {
required
data={Object.keys(localeToNameMap).map(locale => ({
value: locale,
label: localeToNameMap[locale as SupportedLocales]
label: getLocaleName(locale as SupportedLocales),
}))}
defaultValue={getClientLocale()}
placeholder={t`English`}
onChange={(value) =>
dynamicActivateLocale(value as string).then(() => {
document.cookie = `locale=${value};path=/;max-age=31536000`;
// this shouldn't be necessary, but it is due to the wide use of t`...` in the codebase
window.location.reload();
})}
/>
Expand Down
10 changes: 8 additions & 2 deletions frontend/src/components/modals/CreateAttendeeModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ import {showSuccess} from "../../../utilites/notifications.tsx";
import {t, Trans} from "@lingui/macro";
import {useEffect} from "react";
import {InputGroup} from "../../common/InputGroup";
import {getClientLocale, localeToFlagEmojiMap, localeToNameMap, SupportedLocales} from "../../../locales.ts";
import {
getClientLocale,
getLocaleName,
localeToFlagEmojiMap,
localeToNameMap,
SupportedLocales
} from "../../../locales.ts";

export const CreateAttendeeModal = ({onClose}: GenericModalProps) => {
const {eventId} = useParams();
Expand Down Expand Up @@ -128,7 +134,7 @@ export const CreateAttendeeModal = ({onClose}: GenericModalProps) => {
required
data={Object.keys(localeToNameMap).map(locale => ({
value: locale,
label: localeToFlagEmojiMap[locale as SupportedLocales] + ' ' + localeToNameMap[locale as SupportedLocales]
label: localeToFlagEmojiMap[locale as SupportedLocales] + ' ' + getLocaleName(locale as SupportedLocales),
}))}
{...form.getInputProps('locale')}
label={t`Language`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {useCancelEmailChange} from "../../../../mutations/useCancelEmailChange.t
import {useFormErrorResponseHandler} from "../../../../hooks/useFormErrorResponseHandler.tsx";
import {t, Trans} from "@lingui/macro";
import {useResendEmailConfirmation} from "../../../../mutations/useResendEmailConfirmation.ts";
import {localeToFlagEmojiMap, localeToNameMap, SupportedLocales} from "../../../../locales.ts";
import {getLocaleName, localeToFlagEmojiMap, localeToNameMap, SupportedLocales} from "../../../../locales.ts";

export const ManageProfile = () => {
const {data: me, isFetching} = useGetMe();
Expand Down Expand Up @@ -166,7 +166,7 @@ export const ManageProfile = () => {
required
data={Object.keys(localeToNameMap).map(locale => ({
value: locale,
label: localeToFlagEmojiMap[locale as SupportedLocales] + ' ' + localeToNameMap[locale as SupportedLocales]
label: localeToFlagEmojiMap[locale as SupportedLocales] + ' ' + getLocaleName(locale as SupportedLocales),
}))}
{...profileForm.getInputProps('locale')}
label={t`Language`}
Expand Down
18 changes: 11 additions & 7 deletions frontend/src/locales.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,19 @@ export const localeToFlagEmojiMap: Record<SupportedLocales, string> = {
};

export const localeToNameMap: Record<SupportedLocales, string> = {
en: t`English`,
de: t`German`,
fr: t`French`,
pt: t`Portuguese`,
es: t`Spanish`,
"zh-cn": t`Chinese`,
"pt-br": t`Portuguese (Brazil)`,
en: `English`,
de: `German`,
fr: `French`,
pt: `Portuguese`,
es: `Spanish`,
"zh-cn": `Chinese`,
"pt-br": `Portuguese (Brazil)`,
};

export const getLocaleName = (locale: SupportedLocales) => {
return t`${localeToNameMap[locale]}`
}

export const getClientLocale = () => {
if (typeof window !== "undefined") {
const storedLocale = document
Expand Down
Loading