From 8a141fa444e3d605f05763c6003085c24880e5c6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 08:25:06 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/App.jsx | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/App.jsx b/rsf-admin/src/App.jsx
index 328a4b6..9efadba 100644
--- a/rsf-admin/src/App.jsx
+++ b/rsf-admin/src/App.jsx
@@ -29,18 +29,16 @@
} from "./config/setting";
import ResourceContent from "./page/ResourceContent";
import { getSystemInfo, getSystemDicts, tenants } from "@/api/auth";
+import chineseMessages from 'ra-language-chinese';
const i18nProvider = polyglotI18nProvider(
(locale) => {
if (locale === "en") {
return import("./i18n/en").then((messages) => messages.default);
}
- // fallback
- return zhMessages;
+ return { ...chineseMessages, ...zhMessages };
},
- // default
- // 'en',
- resolveBrowserLocale("zh", { fullLocale: true }),
+ "zh",
[
{ locale: "en", name: "English" },
{ locale: "zh", name: "绠�浣撲腑鏂�" },
@@ -111,4 +109,4 @@
</StoreContextProvider>
);
-export default AppWrapper;
+export default AppWrapper;
\ No newline at end of file
--
Gitblit v1.9.1