Skip to content

Commit f48ed63

Browse files
Imiss-U1025Imiss-U1025
committed
fixed error that occur use await
1 parent 123c888 commit f48ed63

File tree

4 files changed

+59
-52
lines changed

4 files changed

+59
-52
lines changed

‎client/packages/lowcoder-design/src/i18n/design/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ export const initTranslator = async (lang?: string) => {
2424
language = translator.language;
2525
transToNode = (key: any, variables?: any) => translator.transToNode?.(key, variables);
2626
trans = (key: any, variables?: any) => translator.trans?.(key, variables);
27-
}
2827

28+
}
2929

30-
await initTranslator();
3130

3231
export { language, trans, transToNode };

‎client/packages/lowcoder/src/i18n/index.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getI18nObjects, Translator } from "lowcoder-core";
22
import * as localeData from "./locales";
33
import { I18nObjects } from "./locales/types";
4-
import { languagesMetadata } from "./languagesMeta";
4+
import {initlanguageMeta, languagesMetadata} from "./languagesMeta";
55
import { ReactNode } from "react";
66
import { getLanguage } from "util/editor"
77

@@ -12,10 +12,15 @@ let trans: transType;
1212
let transToNode: transToNodeType;
1313
let language: string = getLanguage();
1414

15-
export const initTranslator = async (langs : string) => {
16-
const lang = langs;
17-
let langJson = await (localeData as any)[lang || language]();
18-
langJson = {[lang || language]: langJson}
15+
export let i18nObjs : I18nObjects;
16+
export const initTranslator = async (langs? : string) => {
17+
const lang = langs || language;
18+
const objFileName = (REACT_APP_LANGUAGES || language) + "Obj";
19+
let langJson = await (localeData as any)[lang]()
20+
let langObjJson = await (localeData as any)[objFileName]()
21+
langJson = {[lang]: langJson, [(REACT_APP_LANGUAGES || language) + "Obj"]: langObjJson}
22+
await initlanguageMeta();
23+
i18nObjs = getI18nObjects<I18nObjects>(langJson, REACT_APP_LANGUAGES || language);
1924
const translator = new Translator<typeof langJson>(
2025
langJson,
2126
REACT_APP_LANGUAGES,
@@ -27,15 +32,12 @@ export const initTranslator = async (langs : string) => {
2732
trans = (key: any, variables?: any) => translator.trans?.(key, variables);
2833
}
2934

30-
const langJson = await (localeData as any)[REACT_APP_LANGUAGES || language]();
31-
export const i18nObjs = getI18nObjects<I18nObjects>(langJson, REACT_APP_LANGUAGES || language);
3235

3336
export const languageList = Object.keys(languagesMetadata).map(code => ({
3437
languageCode: code,
3538
languageName: languagesMetadata[code].languageName,
3639
flag: languagesMetadata[code].flag
3740
}));
3841

39-
await initTranslator(getLanguage());
4042

4143
export { language, trans, transToNode };

‎client/packages/lowcoder/src/i18n/languagesMeta.ts

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
1-
import {
2-
Flag_de,
3-
Flag_gb,
4-
Flag_it,
5-
Flag_cn,
6-
Flag_fr,
7-
Flag_ru,
8-
Flag_cz,
9-
Flag_pl,
10-
Flag_es,
11-
Flag_vi,
12-
Flag_id,
13-
Flag_tr,
14-
Flag_th,
15-
Flag_ar,
16-
Flag_pt,
17-
Flag_br
18-
} from "lowcoder-design";
1+
192
import { es, ru } from "./locales";
203

4+
215
// Define the structure for a single language's metadata
226
export interface LanguageMeta {
23-
languageName: string;
24-
flag: React.FC<React.SVGProps<SVGSVGElement>>;
25-
}
26-
27-
// Define the structure for the container of all language metadatas
28-
export interface LanguagesMetadata {
29-
[key: string]: LanguageMeta;
30-
}
31-
32-
// Example metadata object
33-
export const languagesMetadata: LanguagesMetadata = {
7+
languageName: string;
8+
flag: React.FC<React.SVGProps<SVGSVGElement>>;
9+
}
10+
export let languagesMetadata : LanguagesMetadata = {};
11+
// Define the structure for the container of all language metadatas
12+
export interface LanguagesMetadata {
13+
[key: string]: LanguageMeta;
14+
}
15+
16+
let Flag_de:any = null;
17+
let Flag_gb:any = null;
18+
let Flag_it:any = null;
19+
let Flag_cn:any = null;
20+
let Flag_ru:any = null;
21+
let Flag_es:any = null;
22+
let Flag_br:any = null;
23+
export const initlanguageMeta = async () => {
24+
Flag_de = await import("lowcoder-design").then(module => module.Flag_de);
25+
Flag_gb = await import("lowcoder-design").then(module => module.Flag_gb);
26+
Flag_it = await import("lowcoder-design").then(module => module.Flag_it);
27+
Flag_cn = await import("lowcoder-design").then(module => module.Flag_cn);
28+
Flag_ru = await import("lowcoder-design").then(module => module.Flag_ru);
29+
Flag_es = await import("lowcoder-design").then(module => module.Flag_es);
30+
Flag_br = await import("lowcoder-design").then(module => module.Flag_br);
31+
languagesMetadata = {
3432
en: {
3533
languageName: "English",
36-
flag: Flag_gb
34+
flag: Flag_gb
3735
},
3836
zh: {
3937
languageName: "中文",
@@ -44,8 +42,8 @@ export interface LanguageMeta {
4442
flag: Flag_de
4543
},
4644
pt: {
47-
languageName: "Português",
48-
flag: Flag_br
45+
languageName: "Português",
46+
flag: Flag_br
4947
},
5048
it: {
5149
languageName: "Italiano",
@@ -60,4 +58,4 @@ export interface LanguageMeta {
6058
flag: Flag_ru
6159
},
6260
};
63-
61+
}

‎client/packages/lowcoder/src/index.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ import * as supabase from "@supabase/supabase-js";
66

77
import * as uuid from "uuid";
88
import "regenerator-runtime/runtime";
9-
import "virtual:globals";
9+
// import "virtual:globals";
1010
import { debug } from "loglevel";
11-
import { bootstrap } from "./app";
11+
// import { bootstrap } from "./app";
1212
import "./index.less";
1313
import log from "loglevel";
1414
import "antd-mobile/es/global";
1515
import 'animate.css';
16+
import {initTranslator as tran1} from "i18n/design";
17+
import {initTranslator as tran2} from "i18n";
18+
import {isEditor} from "@lowcoder-ee/util/editor";
19+
1620

1721
window.numbro = numbro;
1822
window.Papa = Papa;
@@ -39,10 +43,14 @@ debug(`REACT_APP_API_SERVICE_URL:, ${REACT_APP_API_SERVICE_URL}`);
3943
debug(`REACT_APP_NODE_SERVICE_URL:, ${REACT_APP_NODE_SERVICE_URL}`);
4044
debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`);
4145
debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
42-
43-
try {
44-
bootstrap();
45-
hideLoading();
46-
} catch (e) {
47-
log.error(e);
48-
}
46+
tran1().then(() => {
47+
tran2().then(async () => {
48+
try {
49+
const bootstrap = await import("./app").then(module => module.bootstrap);
50+
bootstrap();
51+
hideLoading();
52+
} catch (e) {
53+
log.error(e);
54+
}
55+
})
56+
})

0 commit comments

Comments
 (0)