Merge branch 'next' into develop

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

View File

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

View File

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