fixed language setting

Imiss-U1025 · Imiss-U1025 · commit 463fd46eb38a · 2024-11-15T10:57:15.000-05:00
diff --git a/client/packages/lowcoder-design/src/i18n/design/index.ts b/client/packages/lowcoder-design/src/i18n/design/index.ts
@@ -24,8 +24,6 @@ export const initTranslator = async (lang?: string) => {
     language = translator.language;
     transToNode = (key: any, variables?: any) => translator.transToNode?.(key, variables);
     trans = (key: any, variables?: any) => translator.trans?.(key, variables);
-
 }
 
-
 export { language, trans, transToNode };
diff --git a/client/packages/lowcoder/src/i18n/index.tsx b/client/packages/lowcoder/src/i18n/index.tsx
@@ -11,6 +11,7 @@ type transToNodeType = (key: any, variables?: any) => ReactNode;
 let trans: transType;
 let transToNode: transToNodeType;
 let language: string = getLanguage();
+export let languageList: any[];
 
 export let i18nObjs : I18nObjects;
 export const initTranslator = async (langs? : string) => {
@@ -21,6 +22,11 @@ export const initTranslator = async (langs? : string) => {
   langJson = {[lang]: langJson, [(REACT_APP_LANGUAGES || language) + "Obj"]: langObjJson}
   await initlanguageMeta();
   i18nObjs = getI18nObjects<I18nObjects>(langJson, REACT_APP_LANGUAGES || language);
+  languageList = Object.keys(languagesMetadata).map(code => ({
+    languageCode: code,
+    languageName: languagesMetadata[code].languageName,
+    flag: languagesMetadata[code].flag
+  }));
   const translator =  new Translator<typeof langJson>(
       langJson,
       REACT_APP_LANGUAGES,
@@ -32,12 +38,4 @@ export const initTranslator = async (langs? : string) => {
   trans = (key: any, variables?: any) => translator.trans?.(key, variables);
 }
 
-
-export const languageList = Object.keys(languagesMetadata).map(code => ({
-  languageCode: code,
-  languageName: languagesMetadata[code].languageName,
-  flag: languagesMetadata[code].flag
-}));
-
-
 export { language, trans, transToNode };
diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts
@@ -6,16 +6,13 @@ import * as supabase from "@supabase/supabase-js";
 
 import * as uuid from "uuid";
 import "regenerator-runtime/runtime";
-// import "virtual:globals";
 import { debug } from "loglevel";
-// import { bootstrap } from "./app";
 import "./index.less";
 import log from "loglevel";
 import "antd-mobile/es/global";
 import 'animate.css';
 import {initTranslator as tran1} from "i18n/design";
 import {initTranslator as tran2} from "i18n";
-import {isEditor} from "@lowcoder-ee/util/editor";
 
 
 window.numbro = numbro;

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ export const initTranslator = async (lang?: string) => {`
`24`	`24`	`language = translator.language;`
`25`	`25`	`transToNode = (key: any, variables?: any) => translator.transToNode?.(key, variables);`
`26`	`26`	`trans = (key: any, variables?: any) => translator.trans?.(key, variables);`
`27`		`-`
`28`	`27`	`}`
`29`	`28`
`30`		`-`
`31`	`29`	`export { language, trans, transToNode };`