From e666c9c7bd4e661bb21ad3a45f9fe93ee2c84811 Mon Sep 17 00:00:00 2001 From: Manuel Stahl Date: Mon, 22 Apr 2024 10:57:44 +0200 Subject: [PATCH] Fallback to english if no translation in the current language is available Change-Id: I94ecf5f2d742b1653177c49cef6b1b7fd6e96df0 --- src/App.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/App.jsx b/src/App.jsx index 48be314..5c1a88d 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,6 +6,7 @@ import { resolveBrowserLocale, } from "react-admin"; import polyglotI18nProvider from "ra-i18n-polyglot"; +import merge from "lodash/merge"; import authProvider from "./synapse/authProvider"; import dataProvider from "./synapse/dataProvider"; import users from "./components/users"; @@ -33,7 +34,8 @@ const messages = { zh: chineseMessages, }; const i18nProvider = polyglotI18nProvider( - locale => (messages[locale] ? messages[locale] : messages.en), + locale => + messages[locale] ? merge({}, messages.en, messages[locale]) : messages.en, resolveBrowserLocale(), [ { locale: "en", name: "English" },