Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix downloading all languages (#528)

Jakob5b23b0a6b950
diff --git a/frontend/src/entry.client.tsx b/frontend/src/entry.client.tsx
index 10c7f3aa8..2f8095897 100644
--- a/frontend/src/entry.client.tsx
+++ b/frontend/src/entry.client.tsx
@@ -5,7 +5,7 @@ import {hydrate} from "@tanstack/react-query";
import {router} from "./router";
import {App} from "./App";
import {queryClient} from "./utilites/queryClient";
-import {getClientLocale} from "./locales.ts";
+import {dynamicActivateLocale, getClientLocale, getSupportedLocale} from "./locales.ts";
declare global {
interface Window {
@@ -18,6 +18,7 @@ if (window.__REHYDRATED_STATE__) {
}
async function initClientApp() {
+ dynamicActivateLocale(getSupportedLocale(getClientLocale()));
// Determine if any of the initial routes are lazy
const lazyMatches = matchRoutes(router, window.location)?.filter(
(m) => m.route.lazy
diff --git a/frontend/src/locales.ts b/frontend/src/locales.ts
index 501940aaa..c05394fb9 100644
--- a/frontend/src/locales.ts
+++ b/frontend/src/locales.ts
@@ -1,40 +1,9 @@
-// @ts-ignore
-import {messages as en} from "./locales/en.po";
-// @ts-ignore
-import {messages as de} from "./locales/de.po";
-// @ts-ignore
-import {messages as fr} from "./locales/fr.po";
-// @ts-ignore
-import {messages as nl} from "./locales/nl.po";
-// @ts-ignore
-import {messages as pt} from "./locales/pt.po";
-// @ts-ignore
-import {messages as es} from "./locales/es.po";
-// @ts-ignore
-import {messages as zhCn} from "./locales/zh-cn.po";
-// @ts-ignore
-import {messages as zhHk} from "./locales/zh-hk.po";
-// @ts-ignore
-import {messages as ptBr} from "./locales/pt-br.po";
-// @ts-ignore
-import {messages as vi} from "./locales/vi.po";
import {i18n} from "@lingui/core";
import {t} from "@lingui/macro";
export type SupportedLocales = "en" | "de" | "fr" | "nl" | "pt" | "es" | "zh-cn" | "pt-br" | "vi" |"zh-hk";
-export const localeMessages: Record<string, any> = {
- en: en,
- de: de,
- fr: fr,
- nl: nl,
- pt: pt,
- es: es,
- "zh-cn": zhCn,
- "zh-hk": zhHk,
- "pt-br": ptBr,
- vi: vi,
-};
+export const availableLocales = ["en", "de", "fr", "nl", "pt", "es", "zh-cn", "zh-hk", "pt-br", "vi",];
export const localeToFlagEmojiMap: Record<SupportedLocales, string> = {
en: '🇬🇧',
@@ -85,24 +54,21 @@ export const getClientLocale = () => {
};
export async function dynamicActivateLocale(locale: string) {
- try {
- const messages = localeMessages[locale] || localeMessages["en"];
- i18n.load(locale, messages);
+ locale = availableLocales.includes(locale) ? locale : "en";
+ const module = (await import(`./locales/${locale}.po`));
+ i18n.load(locale, module.messages);
i18n.activate(locale);
- } catch (error) {
- i18n.activate("en");
- }
}
export const getSupportedLocale = (userLocale: string) => {
const normalizedLocale = userLocale.toLowerCase();
- if (localeMessages[normalizedLocale]) {
+ if (availableLocales.includes(normalizedLocale)) {
return normalizedLocale;
}
const mainLanguage = normalizedLocale.split('-')[0];
- const mainLocale = Object.keys(localeMessages).find(locale => locale.startsWith(mainLanguage));
+ const mainLocale = availableLocales.find(locale => locale.startsWith(mainLanguage));
if (mainLocale) {
return mainLocale;
}