fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 06:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-12 01:49:20 +00:00
commit 453e96770d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/sdk/src/APIClient.ts
View File

@ -125,7 +125,7 @@ export class Auth {
* use {@link Auth#locale} instead * use {@link Auth#locale} instead
*/ */
getLocale() { getLocale() {
return this.getOption('locale') || 'en-US'; return this.getOption('locale');
} }
/** /**

2
packages/plugins/@nocobase/plugin-field-markdown-vditor/src/client/components/Edit.tsx
View File

@ -28,7 +28,7 @@ export const Edit = withDynamicSchemaProps((props) => {
const apiClient = useAPIClient(); const apiClient = useAPIClient();
const cdn = useCDN(); const cdn = useCDN();
const { wrapSSR, hashId, componentCls: containerClassName } = useStyle(); const { wrapSSR, hashId, componentCls: containerClassName } = useStyle();
const locale = apiClient.auth.locale; const locale = apiClient.auth.locale || 'en-US';
const lang: any = useMemo(() => { const lang: any = useMemo(() => {
const currentLang = locale.replace(/-/g, '_'); const currentLang = locale.replace(/-/g, '_');