diff --git a/.gitignore b/.gitignore
index 3bce51c..6d21de0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 # vendor/
 
 .vscode/
+.idea/
 .DS_Store
 data
 output
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 92738a4..3a96267 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -15,6 +15,7 @@
         "fetch": "1.1.0",
         "highlight.js": "^11.9.0",
         "js-base64": "^3.7.5",
+        "lodash": "^4.17.21",
         "lodash.throttle": "^4.1.1",
         "markdown-it": "^14.1.0",
         "markdown-it-mark": "^4.0.0",
@@ -9708,8 +9709,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
@@ -22348,8 +22348,7 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.debounce": {
       "version": "4.0.8",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 65a1301..6349b57 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -4,13 +4,14 @@
 
 <script lang="ts">
 import { useAppStore } from 'src/stores/app';
-import { onBeforeUnmount, onMounted } from 'vue';
+import { onBeforeMount, onBeforeUnmount } from 'vue';
 import { useSocketStore } from 'src/stores/websocketStore';
 import { BtNotify, NotifyDefinedType } from '@bytetrade/ui';
 import { bus, BUS_EVENT } from 'src/utils/bus';
 import { useUserStore } from 'src/stores/user';
 import { i18n } from 'src/boot/i18n';
 import { supportLanguages } from 'src/i18n';
+import { useMenuStore } from 'src/stores/menu';
 // import { testSatisfies } from 'src/utils/version';
 
 export default {
@@ -18,6 +19,7 @@ export default {
 		const appStore = useAppStore();
 		const websocketStore = useSocketStore();
 		const userStore = useUserStore();
+		const menuStore = useMenuStore();
 
 		let terminusLanguage = '';
 		let terminusLanguageInfo: any = document.querySelector(
@@ -37,8 +39,8 @@ export default {
 			}
 		}
 
-		onMounted(async () => {
-			await appStore.prefetch();
+		onBeforeMount(async () => {
+			await menuStore.init();
 			if (!appStore.isPublic) {
 				// testSatisfies();
 				websocketStore.start();
diff --git a/frontend/src/api/language.ts b/frontend/src/api/language.ts
new file mode 100644
index 0000000..c8eafc7
--- /dev/null
+++ b/frontend/src/api/language.ts
@@ -0,0 +1,31 @@
+import axios from 'axios';
+import globalConfig from 'src/api/config';
+import { MenuData } from 'src/constants/constants';
+
+export async function getMenuData(): Promise<MenuData | null> {
+	try {
+		const { data }: any = await axios.get(
+			globalConfig.url + '/app-store/v1/applications/menutypes'
+		);
+		console.log('getMenuData');
+		console.log(data);
+		return data ? data : null;
+	} catch (e) {
+		console.log(e);
+		return null;
+	}
+}
+
+export async function getAppMultiLanguage() {
+	try {
+		const { data }: any = await axios.get(
+			globalConfig.url + '/app-store/v1/applications/i18ns'
+		);
+		console.log('getAppMultiLanguage');
+		console.log(data);
+		return data ? data : [];
+	} catch (e) {
+		console.log(e);
+		return [];
+	}
+}
diff --git a/frontend/src/api/storeApi.ts b/frontend/src/api/storeApi.ts
index 46120e4..863ef1d 100644
--- a/frontend/src/api/storeApi.ts
+++ b/frontend/src/api/storeApi.ts
@@ -108,7 +108,6 @@ export async function getTop(category?: string): Promise<AppStoreInfo[]> {
 		return [];
 	}
 }
-
 export async function getLatest(category?: string): Promise<AppStoreInfo[]> {
 	try {
 		let url = '/app-store/v1/applications/latest';
diff --git a/frontend/src/assets/fonts/back.svg b/frontend/src/assets/fonts/back.svg
deleted file mode 100644
index d734807..0000000
--- a/frontend/src/assets/fonts/back.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="18" viewBox="0 0 10 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.3636 0.635691C8.71508 0.284219 9.28492 0.284219 9.6364 0.635691C9.98787 0.987163 9.98787 1.55701 9.6364 1.90848L2.77746 8.76742C2.62125 8.92363 2.62125 9.17689 2.77746 9.3331L9.6364 16.192C9.98787 16.5435 9.98787 17.1134 9.6364 17.4648C9.28492 17.8163 8.71508 17.8163 8.3636 17.4648L0.373297 9.47453C0.138983 9.24021 0.138982 8.86031 0.373297 8.626L8.3636 0.635691Z" fill="#282D53" stroke="#282D53" stroke-width="0.2" stroke-linecap="round"/>
-</svg>
diff --git a/frontend/src/components/appcard/AppCard.vue b/frontend/src/components/appcard/AppCard.vue
index 3f1846d..49c32d4 100644
--- a/frontend/src/components/appcard/AppCard.vue
+++ b/frontend/src/components/appcard/AppCard.vue
@@ -128,7 +128,9 @@
 
 		<div class="application_right column justify-center items-start">
 			<div class="application_title_layout row justify-start items-baseline">
-				<div class="application_title text-ink-1">{{ item.title }}</div>
+				<div class="application_title text-ink-1">
+					{{ getAppFieldI18n(item, APP_FIELD.TITLE) }}
+				</div>
 				<div v-if="version" class="application_version">
 					{{ item.versionName }}
 				</div>
@@ -142,7 +144,7 @@
 						: 'application_content'
 				"
 			>
-				{{ item.desc }}
+				{{ getAppFieldI18n(item, APP_FIELD.DESCRIPTION) }}
 			</div>
 			<span
 				v-if="!appStore.isPublic"
@@ -175,7 +177,12 @@
 
 <script lang="ts" setup>
 import { onMounted, PropType, ref } from 'vue';
-import { AppStoreInfo, TRANSACTION_PAGE } from 'src/constants/constants';
+import {
+	AppStoreInfo,
+	getAppFieldI18n,
+	APP_FIELD,
+	TRANSACTION_PAGE
+} from 'src/constants/constants';
 import InstallButton from 'components/appcard/InstallButton.vue';
 import { useRouter } from 'vue-router';
 import { useAppStore } from 'src/stores/app';
diff --git a/frontend/src/components/appcard/AppSmallCard.vue b/frontend/src/components/appcard/AppSmallCard.vue
index 588ad92..efc0025 100644
--- a/frontend/src/components/appcard/AppSmallCard.vue
+++ b/frontend/src/components/appcard/AppSmallCard.vue
@@ -34,10 +34,10 @@
 				<div
 					class="app-small-card__right__text__title text-subtitle2 text-ink-1"
 				>
-					{{ item.title }}
+					{{ getAppFieldI18n(item, APP_FIELD.TITLE) }}
 				</div>
 				<div class="app-small-card__right__text__content text-body3 text-ink-2">
-					{{ item.desc }}
+					{{ getAppFieldI18n(item, APP_FIELD.DESCRIPTION) }}
 				</div>
 			</div>
 			<install-button v-if="!appStore.isPublic" :item="item" />
@@ -53,7 +53,12 @@
 
 <script lang="ts" setup>
 import { onMounted, PropType, ref } from 'vue';
-import { AppStoreInfo, TRANSACTION_PAGE } from 'src/constants/constants';
+import {
+	APP_FIELD,
+	AppStoreInfo,
+	getAppFieldI18n,
+	TRANSACTION_PAGE
+} from 'src/constants/constants';
 import InstallButton from 'src/components/appcard/InstallButton.vue';
 import { useRouter } from 'vue-router';
 import { useAppStore } from 'src/stores/app';
diff --git a/frontend/src/components/appcard/MyAppCard.vue b/frontend/src/components/appcard/MyAppCard.vue
index 695e318..d9a4509 100644
--- a/frontend/src/components/appcard/MyAppCard.vue
+++ b/frontend/src/components/appcard/MyAppCard.vue
@@ -39,7 +39,7 @@
 		<div class="my-application-info column justify-start items-start">
 			<div class="my-application-title-layout row justify-start items-center">
 				<div class="my-application-title text-h6 text-ink-1">
-					{{ item.title }}
+					{{ getAppFieldI18n(item, APP_FIELD.TITLE) }}
 				</div>
 				<div
 					v-if="version"
@@ -50,7 +50,7 @@
 			</div>
 
 			<div class="my-application-content text-body3 text-ink-3">
-				{{ item.desc }}
+				{{ getAppFieldI18n(item, APP_FIELD.DESCRIPTION) }}
 			</div>
 
 			<div
@@ -136,7 +136,9 @@
 <script lang="ts" setup>
 import { onMounted, PropType, ref } from 'vue';
 import {
+	APP_FIELD,
 	AppStoreInfo,
+	getAppFieldI18n,
 	SOURCE_TYPE,
 	TRANSACTION_PAGE
 } from 'src/constants/constants';
diff --git a/frontend/src/components/appintro/AppTitleBar.vue b/frontend/src/components/appintro/AppTitleBar.vue
index 05011c3..2cdc12e 100644
--- a/frontend/src/components/appintro/AppTitleBar.vue
+++ b/frontend/src/components/appintro/AppTitleBar.vue
@@ -19,7 +19,7 @@
 					</template>
 				</q-img>
 				<div class="q-ml-md text-h5 text-ink-1">
-					{{ item.title }}
+					{{ getAppFieldI18n(item, APP_FIELD.TITLE) }}
 				</div>
 				<div class="q-ml-sm text-h6 text-ink-1">{{ item.versionName }}</div>
 			</div>
@@ -37,7 +37,11 @@
 <script lang="ts" setup>
 import InstallButton from 'components/appcard/InstallButton.vue';
 import { PropType } from 'vue';
-import { AppStoreInfo } from 'src/constants/constants';
+import {
+	APP_FIELD,
+	AppStoreInfo,
+	getAppFieldI18n
+} from 'src/constants/constants';
 import { useRouter } from 'vue-router';
 import { useAppStore } from 'src/stores/app';
 
diff --git a/frontend/src/components/topic/AppStoreRecItem.vue b/frontend/src/components/topic/AppStoreRecItem.vue
index ff23282..db60951 100644
--- a/frontend/src/components/topic/AppStoreRecItem.vue
+++ b/frontend/src/components/topic/AppStoreRecItem.vue
@@ -7,9 +7,11 @@
 			<img :src="item ? item.icon : ''" class="application_top_logo" />
 		</div>
 		<div class="modal_application_text">
-			<p class="modal_application_title">{{ item ? item.title : '' }}</p>
+			<p class="modal_application_title">
+				{{ item ? getAppFieldI18n(item, APP_FIELD.TITLE) : '' }}
+			</p>
 			<p class="modal_application_content">
-				{{ item ? item.desc : '' }}
+				{{ item ? getAppFieldI18n(item, APP_FIELD.DESCRIPTION) : '' }}
 			</p>
 		</div>
 		<div class="modal_application_install">
@@ -46,7 +48,11 @@
 <script lang="ts" setup>
 import { PropType } from 'vue';
 import { useAppStore } from 'src/stores/app';
-import { AppStoreInfo } from 'src/constants/constants';
+import {
+	APP_FIELD,
+	AppStoreInfo,
+	getAppFieldI18n
+} from 'src/constants/constants';
 
 defineProps({
 	item: {
diff --git a/frontend/src/constants/constants.ts b/frontend/src/constants/constants.ts
index a1e24a3..b0827b9 100644
--- a/frontend/src/constants/constants.ts
+++ b/frontend/src/constants/constants.ts
@@ -1,4 +1,5 @@
 import { CFG_TYPE } from 'src/constants/config';
+import { i18n } from 'src/boot/i18n';
 
 export interface AppStoreInfo {
 	id: string;
@@ -207,6 +208,17 @@ export enum ROLE_TYPE {
 	Admin = 'platform-admin'
 }
 
+export interface MenuType {
+	label: string;
+	key: string;
+	icon: string;
+}
+
+export interface MenuData {
+	menuTypes: MenuType[];
+	i18n: any;
+}
+
 export enum TRANSACTION_PAGE {
 	App = 'App',
 	List = 'List',
@@ -321,3 +333,67 @@ export enum PERMISSION_SYSDATA_GROUP {
 	secret_infisical = 'secret.infisical',
 	secret_vault = 'secret.vault'
 }
+
+export enum APP_FIELD {
+	TITLE = 'title',
+	ENTRANCES_TITLE = 'entrances?_title',
+	ENTRANCES_NAME = 'entrances?_name',
+	DESCRIPTION = 'description',
+	FULL_DESCRIPTION = 'fullDescription',
+	UPGRADE_DESCRIPTION = 'upgradeDescription'
+}
+
+export function getAppFieldI18n(
+	app: AppStoreInfo,
+	field: APP_FIELD,
+	index = -1
+) {
+	let key = '';
+	switch (field) {
+		case APP_FIELD.DESCRIPTION:
+		case APP_FIELD.TITLE:
+		case APP_FIELD.FULL_DESCRIPTION:
+		case APP_FIELD.UPGRADE_DESCRIPTION:
+			key = app.name + '_' + field;
+			break;
+		case APP_FIELD.ENTRANCES_NAME:
+		case APP_FIELD.ENTRANCES_TITLE:
+			if (index !== -1) {
+				key =
+					app.name +
+					'_' +
+					APP_FIELD.ENTRANCES_NAME.replace('?', index.toString());
+			}
+			break;
+	}
+	if (key) {
+		const exist = i18n.global.te(key);
+		// console.log(key, exist);
+		if (exist) {
+			return i18n.global.t(key);
+		}
+	}
+
+	switch (field) {
+		case APP_FIELD.DESCRIPTION:
+			return app.desc;
+		case APP_FIELD.TITLE:
+		case APP_FIELD.FULL_DESCRIPTION:
+		case APP_FIELD.UPGRADE_DESCRIPTION:
+			return app[field];
+		case APP_FIELD.ENTRANCES_NAME:
+			if (index !== -1) {
+				const array1 = app.entrances;
+				return array1[index].name;
+			} else {
+				return '';
+			}
+		case APP_FIELD.ENTRANCES_TITLE:
+			if (index !== -1) {
+				const array2 = app.entrances;
+				return array2[index].title;
+			} else {
+				return '';
+			}
+	}
+}
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 5a85146..f54a9bb 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -104,7 +104,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
 import { useMenuStore } from 'src/stores/menu';
 import { MENU_TYPE, TRANSACTION_PAGE } from '../constants/constants';
@@ -113,54 +113,6 @@ import { useAppStore } from 'src/stores/app';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
-const itemsRef = ref([
-	{
-		label: t('base.extensions'),
-		key: 'Application',
-		children: [
-			{
-				label: t('main.discover'),
-				key: MENU_TYPE.Application.Home,
-				icon: 'sym_r_radar'
-			},
-			{
-				label: t('main.productivity'),
-				key: MENU_TYPE.Application.Productivity,
-				icon: 'sym_r_business_center'
-			},
-			{
-				label: t('main.utilities'),
-				key: MENU_TYPE.Application.Utilities,
-				icon: 'sym_r_extension'
-			},
-			{
-				label: t('main.entertainment'),
-				key: MENU_TYPE.Application.Entertainment,
-				icon: 'sym_r_interests'
-			},
-			{
-				label: t('main.social_network'),
-				key: MENU_TYPE.Application.SocialNetwork,
-				icon: 'sym_r_group'
-			},
-			{
-				label: t('main.blockchain'),
-				key: MENU_TYPE.Application.Blockchain,
-				icon: 'sym_r_stack'
-			},
-			{
-				label: t('main.recommendation'),
-				key: MENU_TYPE.Application.Recommendation,
-				icon: 'sym_r_featured_play_list'
-			}
-			// {
-			// 	label: t('main.models'),
-			// 	key: MENU_TYPE.Application.Models,
-			// 	icon: 'sym_r_neurology'
-			// }
-		]
-	}
-]);
 const leftDrawerOpen = ref(false);
 const menuStore = useMenuStore();
 const Router = useRouter();
@@ -174,6 +126,19 @@ const appStore = useAppStore();
 const updateCount = ref(0);
 const showBarShadow = ref(false);
 
+const itemsRef = computed(() => {
+	if (menuStore.menuList.length === 0) {
+		return [];
+	}
+	return [
+		{
+			label: t('base.extensions'),
+			key: 'Application',
+			children: menuStore.menuList
+		}
+	];
+});
+
 const changeItemMenu = (data: any): void => {
 	const type = data.key;
 	menuStore.changeItemMenu(type);
diff --git a/frontend/src/pages/application/AppDetailPage.vue b/frontend/src/pages/application/AppDetailPage.vue
index c9d050c..d4c795b 100644
--- a/frontend/src/pages/application/AppDetailPage.vue
+++ b/frontend/src/pages/application/AppDetailPage.vue
@@ -218,13 +218,17 @@
 											type: cfgType?.toUpperCase()
 										})
 									"
-									:description="item.fullDescription"
+									:description="
+										getAppFieldI18n(item, APP_FIELD.FULL_DESCRIPTION)
+									"
 								/>
 
 								<app-intro-card
 									class="q-mt-lg"
 									:title="t('detail.whats_new')"
-									:description="item.upgradeDescription"
+									:description="
+										getAppFieldI18n(item, APP_FIELD.UPGRADE_DESCRIPTION)
+									"
 								/>
 
 								<app-intro-card
@@ -618,10 +622,12 @@ import { computed, onActivated, onBeforeUnmount, onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useAppStore } from 'src/stores/app';
 import {
+	APP_FIELD,
 	APP_STATUS,
 	AppStoreInfo,
 	CLIENT_TYPE,
 	DEPENDENCIES_TYPE,
+	getAppFieldI18n,
 	PERMISSION_SYSDATA_GROUP,
 	PermissionNode,
 	TRANSACTION_PAGE
@@ -659,7 +665,6 @@ const appStore = useAppStore();
 const { t } = useI18n();
 const $q = useQuasar();
 const item = ref<AppStoreInfo>();
-const test = ref();
 
 const loadStyle = async () => {
 	if ($q.dark.isActive) {
@@ -951,13 +956,13 @@ const entrancePermissionTask: OnUpdateUITask = {
 			}
 		}
 		const firstLabel = t('permission.entrance_visibility_label', {
-			desktopSize: `${desktopSize > 0 ? desktopSize : 'no'}`,
-			backendSize: ` ${backendSize > 0 ? backendSize : 'no'}`
+			desktopSize: `${desktopSize > 0 ? desktopSize : '0'}`,
+			backendSize: ` ${backendSize > 0 ? backendSize : '0'}`
 		});
 
 		const secondLabel = t('permission.entrance_auth_level_label', {
-			privateSize: `${privateSize > 0 ? privateSize : 'no'}`,
-			publicSize: ` ${publicSize > 0 ? publicSize : 'no'}`
+			privateSize: `${privateSize > 0 ? privateSize : '0'}`,
+			publicSize: ` ${publicSize > 0 ? publicSize : '0'}`
 		});
 
 		entrancePermissionData.value.push({
diff --git a/frontend/src/stores/app.ts b/frontend/src/stores/app.ts
index 8f229d3..83b7b64 100644
--- a/frontend/src/stores/app.ts
+++ b/frontend/src/stores/app.ts
@@ -31,6 +31,7 @@ import { useUserStore } from 'src/stores/user';
 import { i18n } from 'src/boot/i18n';
 import { decodeUnicode } from 'src/utils/utils';
 import { CFG_TYPE } from 'src/constants/config';
+import { getAppMultiLanguage } from 'src/api/language';
 
 export type AppState = {
 	tempAppMap: Record<string, AppStoreInfo>;
@@ -54,6 +55,96 @@ export const useAppStore = defineStore('app', {
 	},
 	actions: {
 		async prefetch() {
+			const appList: any[] = await getAppMultiLanguage();
+
+			const languageMap = {};
+
+			for (let i = 0; i < appList.length; i++) {
+				const data = appList[i];
+				for (const app in data) {
+					const languages = data[app];
+
+					for (const lang in languages) {
+						if (Object.prototype.hasOwnProperty.call(languages, lang)) {
+							const appData = languages[lang];
+
+							if (!languageMap[lang]) {
+								languageMap[lang] = {};
+							}
+
+							for (const key in appData) {
+								if (Object.prototype.hasOwnProperty.call(appData, key)) {
+									const value = appData[key];
+
+									if (Array.isArray(value) && value.length > 0) {
+										for (let i = 0; i < value.length; i++) {
+											const arrayObj = value[i];
+											for (const arrayKey in arrayObj) {
+												if (
+													Object.prototype.hasOwnProperty.call(
+														arrayObj,
+														arrayKey
+													)
+												) {
+													const arrayValue = arrayObj[arrayKey];
+													{
+														const resultKey = `${app}_${key}${i}_${arrayKey}`;
+														languageMap[lang][resultKey] = arrayValue;
+													}
+												}
+											}
+										}
+									} else if (!!appData['metadata']) {
+										for (const arrayKey in appData['metadata']) {
+											if (
+												Object.prototype.hasOwnProperty.call(
+													appData['metadata'],
+													arrayKey
+												)
+											) {
+												const arrayValue = appData['metadata'][arrayKey];
+												{
+													const resultKey = `${app}_${arrayKey}`;
+													languageMap[lang][resultKey] = arrayValue;
+												}
+											}
+										}
+									} else if (!!appData['spec']) {
+										for (const arrayKey in appData['spec']) {
+											if (
+												Object.prototype.hasOwnProperty.call(
+													appData['spec'],
+													arrayKey
+												)
+											) {
+												const arrayValue = appData['spec'][arrayKey];
+												{
+													const resultKey = `${app}_${arrayKey}`;
+													languageMap[lang][resultKey] = arrayValue;
+												}
+											}
+										}
+									} else {
+										const resultKey = `${app}_${key}`;
+										languageMap[lang][resultKey] = value;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			console.log(languageMap);
+
+			for (const language in languageMap) {
+				i18n.global.mergeLocaleMessage(language, languageMap[language]);
+				console.log(
+					`========>>>>>> Merged messages for locale ${language}:`,
+					i18n.global.getLocaleMessage(language)
+				);
+			}
+
 			this.pageData = await getPage();
 		},
 		async init() {
diff --git a/frontend/src/stores/menu.ts b/frontend/src/stores/menu.ts
index 163e7bf..04f46d6 100644
--- a/frontend/src/stores/menu.ts
+++ b/frontend/src/stores/menu.ts
@@ -1,18 +1,68 @@
 import { defineStore } from 'pinia';
-import { MENU_TYPE } from '../constants/constants';
+import { MENU_TYPE, MenuType } from '../constants/constants';
+import { getMenuData } from 'src/api/language';
+import { i18n } from 'src/boot/i18n';
+
+export type MenuState = {
+	menuList: MenuType[];
+	currentItem: string;
+	searchData: string;
+	leftDrawerOpen: boolean;
+};
 
 export const useMenuStore = defineStore('menu', {
 	state: () => {
 		return {
+			menuList: [],
 			currentItem: MENU_TYPE.Application.Home,
 			searchData: '',
 			leftDrawerOpen: true
-		};
+		} as MenuState;
 	},
 	getters: {
 		//doubleCount: (state) => state.counter * 2,
 	},
 	actions: {
+		async init() {
+			const result = await getMenuData();
+			if (!result) {
+				console.log('get menu data error');
+				return;
+			}
+			const languages = result.i18n;
+			const languageMap = {};
+
+			for (const lang in languages) {
+				if (Object.prototype.hasOwnProperty.call(languages, lang)) {
+					const data = languages[lang];
+					const resultMap = {};
+
+					for (const key in data) {
+						if (Object.prototype.hasOwnProperty.call(data, key)) {
+							resultMap[key] = data[key];
+						}
+					}
+
+					languageMap[lang] = resultMap;
+				}
+			}
+
+			for (const language in languageMap) {
+				i18n.global.mergeLocaleMessage(language, languageMap[language]);
+				console.log(
+					`========>>>>>> Merged messages for locale ${language}:`,
+					i18n.global.getLocaleMessage(language)
+				);
+			}
+
+			this.menuList = result.menuTypes.map((item) => {
+				return {
+					label: i18n.global.t(item.label),
+					key: item.key,
+					icon: item.icon
+				};
+			});
+		},
 		changeItemMenu(item: string) {
 			this.currentItem = item;
 		},
diff --git a/internal/appmgr/app.go b/internal/appmgr/app.go
index e05f933..c83fb5e 100644
--- a/internal/appmgr/app.go
+++ b/internal/appmgr/app.go
@@ -2,8 +2,11 @@ package appmgr
 
 import (
 	"io"
+	"io/ioutil"
+	"market/internal/constants"
 	"market/internal/models"
 	"os"
+	"path"
 
 	"github.com/golang/glog"
 	"gopkg.in/yaml.v3"
@@ -27,6 +30,26 @@ func ReadAppInfo(cfgFileName string) (*models.ApplicationInfo, error) {
 		glog.Warningf("cfg:%s %s", cfgFileName, err.Error())
 		return nil, err
 	}
+	appInfo := appCfg.ToAppInfo()
+	dir := path.Dir(cfgFileName)
+	i18nMap := make(map[string]models.I18n)
+	for _, lang := range appInfo.Locale {
+		data, err := ioutil.ReadFile(path.Join(dir, "i18n", lang, constants.AppCfgFileName))
+		if err != nil {
+			glog.Warningf("failed to get file %s,err=%v", path.Join("i18n", lang, constants.AppCfgFileName), err)
+			continue
+		}
+		var i18n models.I18n
+		i18n.Entrances = make([]models.I18nEntrance, 0)
+		err = yaml.Unmarshal(data, &i18n)
+		if err != nil {
+			glog.Warningf("unmarshal to I18n failed err=%v", err)
+			continue
+		}
 
-	return appCfg.ToAppInfo(), nil
+		i18nMap[lang] = i18n
+	}
+	appInfo.I18n = i18nMap
+
+	return appInfo, nil
 }
diff --git a/internal/appmgr/app_mgr.go b/internal/appmgr/app_mgr.go
index 04c5673..6288846 100644
--- a/internal/appmgr/app_mgr.go
+++ b/internal/appmgr/app_mgr.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"market/internal/boltdb"
 	"market/internal/constants"
 	"market/internal/helm"
@@ -19,13 +20,31 @@ import (
 )
 
 func getAppStoreServiceHost() string {
-	return os.Getenv(constants.AppStoreServiceHostEnv)
+
+	value := os.Getenv(constants.MarketProvider)
+
+	if value == "" {
+		return os.Getenv(constants.AppStoreServiceHostEnv)
+	} else {
+		return value
+	}
 }
 
 func getAppStoreServicePort() string {
 	return os.Getenv(constants.AppStoreServicePortEnv)
 }
 
+func GetAppTypes() (*models.ListResultD, error) {
+	urlTmp := fmt.Sprintf(constants.AppStoreServiceAppTypesURLTempl, getAppStoreServiceHost(), getAppStoreServicePort())
+
+	bodyStr, err := sendHttpRequest(http.MethodGet, urlTmp, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return decodeListResultD(bodyStr)
+}
+
 func GetApps(page, size, category, ty string) (*models.ListResultD, error) {
 	urlTmp := fmt.Sprintf(constants.AppStoreServiceAppListURLTempl, getAppStoreServiceHost(), getAppStoreServicePort(), page, size)
 	if category != "" {
@@ -112,7 +131,7 @@ func GetReadMe(name string) (string, error) {
 
 func GetAppInfos(names []string) (mapInfo map[string]*models.ApplicationInfo, err error) {
 	urlTmp := fmt.Sprintf(constants.AppStoreServiceAppInfosURLTempl, getAppStoreServiceHost(), getAppStoreServicePort())
-
+	glog.Infof("GetAppInfos --> urlTmp: %s", urlTmp)
 	var ms []byte
 	ms, err = json.Marshal(names)
 	if err != nil {
@@ -226,3 +245,27 @@ func GetVersionHistory(appName string) (string, error) {
 
 	return bodyStr, nil
 }
+
+func GetAppI18n(chartName string, locale []string) map[string]models.I18n {
+	i18nMap := make(map[string]models.I18n)
+	chartDirPath := path.Join(constants.ChartsLocalDir, chartName)
+	chartPath := utils.FindChartPath(chartDirPath)
+	if len(chartPath) == 0 {
+		return i18nMap
+	}
+
+	for _, lang := range locale {
+		data, err := ioutil.ReadFile(path.Join(chartPath, "i18n", lang, constants.AppCfgFileName))
+		if err != nil {
+			glog.Infof("Failed to read i18n info err=%v", err)
+			continue
+		}
+		var i18n models.I18n
+		err = json.Unmarshal(data, &i18n)
+		if err != nil {
+			continue
+		}
+		i18nMap[lang] = i18n
+	}
+	return i18nMap
+}
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
index 72bcd4c..d621784 100644
--- a/internal/constants/constants.go
+++ b/internal/constants/constants.go
@@ -50,6 +50,7 @@ const (
 	AppStoreServiceAppURLTempl        = "https://%s:%s/app-store-server/v1/application/%s"
 	AppStoreServiceAppInfoURLTempl    = "https://%s:%s/app-store-server/v1/applications/info/%s"
 	AppStoreServiceAppInfosURLTempl   = "https://%s:%s/app-store-server/v1/applications/infos"
+	AppStoreServiceAppTypesURLTempl   = "https://%s:%s/app-store-server/v1/applications/types"
 	AppStoreServiceAppExistURLTempl   = "https://%s:%s/app-store-server/v1/applications/exist/%s"
 	AppStoreServiceAppListURLTempl    = "https://%s:%s/app-store-server/v1/applications?page=%s&size=%s"
 	AppStoreServiceAppTopURLTempl     = "https://%s:%s/app-store-server/v1/applications/top"
@@ -64,6 +65,7 @@ const (
 	AppServicePortEnv      = "APP_SERVICE_SERVICE_PORT"
 	AppStoreServiceHostEnv = "APP_SOTRE_SERVICE_SERVICE_HOST"
 	AppStoreServicePortEnv = "APP_SOTRE_SERVICE_SERVICE_PORT"
+	MarketProvider         = "MARKET_PROVIDER"
 
 	RecommendServiceInstallURLTempl           = "http://%s:%s/app-service/v1/recommends/%s/install"
 	RecommendServiceUninstallURLTempl         = "http://%s:%s/app-service/v1/recommends/%s/uninstall"
diff --git a/internal/models/app_info.go b/internal/models/app_info.go
index fbf8749..d4518ab 100644
--- a/internal/models/app_info.go
+++ b/internal/models/app_info.go
@@ -2,12 +2,13 @@ package models
 
 import (
 	"encoding/json"
-	"helm.sh/helm/v3/pkg/time"
 	"market/internal/constants"
 	"market/internal/models/tapr"
 	"market/pkg/utils"
 	"path"
 	"strings"
+
+	"helm.sh/helm/v3/pkg/time"
 )
 
 const (
@@ -120,14 +121,15 @@ type ApplicationInfo struct {
 	Status   string `yaml:"status" json:"status,omitempty"`
 	Progress string `json:"progress,omitempty"`
 
-	Language     []string     `yaml:"language" json:"language"`
-	Submitter    string       `yaml:"submitter" json:"submitter"`
-	Doc          string       `yaml:"doc" json:"doc"`
-	Website      string       `yaml:"website" json:"website"`
-	FeatureImage string       `yaml:"featuredImage" json:"featuredImage"`
-	SourceCode   string       `yaml:"sourceCode" json:"sourceCode"`
-	License      []TextAndURL `yaml:"license" json:"license"`
-	Legal        []TextAndURL `yaml:"legal" json:"legal"`
+	Locale       []string        `yaml:"locale" json:"locale"`
+	Submitter    string          `yaml:"submitter" json:"submitter"`
+	Doc          string          `yaml:"doc" json:"doc"`
+	Website      string          `yaml:"website" json:"website"`
+	FeatureImage string          `yaml:"featuredImage" json:"featuredImage"`
+	SourceCode   string          `yaml:"sourceCode" json:"sourceCode"`
+	License      []TextAndURL    `yaml:"license" json:"license"`
+	Legal        []TextAndURL    `yaml:"legal" json:"legal"`
+	I18n         map[string]I18n `yaml:"i18n" json:"i18n"`
 
 	AppLabels []string `yaml:"appLabels" json:"appLabels"`
 
@@ -155,6 +157,27 @@ type AppService struct {
 	Port int32  `yaml:"port" json:"port" bson:"port"`
 }
 
+type I18nEntrance struct {
+	Name  string `yaml:"name" json:"name" bson:"name"`
+	Title string `yaml:"title" json:"title" bson:"title"`
+}
+
+type I18nMetadata struct {
+	Title       string `yaml:"title" json:"title" bson:"title"`
+	Description string `yaml:"description" json:"description" bson:"description"`
+}
+
+type I18nSpec struct {
+	FullDescription    string `yaml:"fullDescription" json:"fullDescription" bson:"fullDescription"`
+	UpgradeDescription string `yaml:"upgradeDescription" json:"upgradeDescription" bson:"upgradeDescription"`
+}
+
+type I18n struct {
+	Metadata  I18nMetadata   `yaml:"metadata" json:"metadata" bson:"metadata"`
+	Entrances []I18nEntrance `yaml:"entrances" json:"entrances" bson:"entrances"`
+	Spec      I18nSpec       `yaml:"spec" json:"spec" bson:"spec"`
+}
+
 type SupportClient struct {
 	Chrome  string `yaml:"chrome" json:"chrome" bson:"chrome"`
 	Edge    string `yaml:"edge" json:"edge" bson:"edge"`
@@ -217,7 +240,7 @@ type AppSpec struct {
 	RequiredGPU        string        `yaml:"requiredGpu" json:"requiredGpu"`
 	RequiredCPU        string        `yaml:"requiredCpu" json:"requiredCpu"`
 
-	Language     []string     `yaml:"language" json:"language"`
+	Locale       []string     `yaml:"locale" json:"locale"`
 	Submitter    string       `yaml:"submitter" json:"submitter"`
 	Doc          string       `yaml:"doc" json:"doc"`
 	Website      string       `yaml:"website" json:"website"`
@@ -301,7 +324,7 @@ func (ac *AppConfiguration) ToAppInfo() *ApplicationInfo {
 		Options:            ac.Options,
 		Entrances:          ac.Entrances,
 
-		Language:     ac.Spec.Language,
+		Locale:       ac.Spec.Locale,
 		Submitter:    ac.Spec.Submitter,
 		Doc:          ac.Spec.Doc,
 		Website:      ac.Spec.Website,
diff --git a/internal/models/types.go b/internal/models/types.go
index cc1cb2f..80edff7 100644
--- a/internal/models/types.go
+++ b/internal/models/types.go
@@ -67,6 +67,38 @@ type ListResponse struct {
 	Data ListResponseData `json:"data"`
 }
 
+type MenuType struct {
+	Label string `json:"label"`
+	Key   string `json:"key"`
+	Icon  string `json:"icon"`
+}
+
+type Localization struct {
+	ZhCN MainData `json:"zh-CN"`
+	EnUS MainData `json:"en-US"`
+}
+
+type MainData struct {
+	Discover       string `json:"discover,omitempty"`
+	Productivity   string `json:"productivity,omitempty"`
+	Utilities      string `json:"utilities,omitempty"`
+	Entertainment  string `json:"entertainment,omitempty"`
+	SocialNetwork  string `json:"socialNetwork,omitempty"`
+	Blockchain     string `json:"blockchain,omitempty"`
+	Recommendation string `json:"recommendation,omitempty"`
+	Models         string `json:"models,omitempty"`
+}
+
+type MenuTypeResponseData struct {
+	MenuTypes []MenuType   `json:"menuTypes"`
+	I18n      Localization `json:"i18n"`
+}
+
+type MenuTypeResponse struct {
+	ResponseBase
+	Data MenuTypeResponseData `json:"data"`
+}
+
 type InfoResponse struct {
 	ResponseBase
 	Data ApplicationInfo `json:"data"`
diff --git a/internal/validate/testdata/nextcloud2/app.cfg b/internal/validate/testdata/nextcloud2/app.cfg
index 5b89f54..aec6042 100644
--- a/internal/validate/testdata/nextcloud2/app.cfg
+++ b/internal/validate/testdata/nextcloud2/app.cfg
@@ -55,8 +55,8 @@ middleware:
     - name: index0
     - name: index0
 options:
-  language:
-  - en
+  locale:
+  - en-US
   policies:
   - uriRegex: "/$"
     level: "two_factor"
diff --git a/pkg/apiserver/service/v1/handler.go b/pkg/apiserver/service/v1/handler.go
index d1d8254..1eaf195 100644
--- a/pkg/apiserver/service/v1/handler.go
+++ b/pkg/apiserver/service/v1/handler.go
@@ -28,6 +28,7 @@ import (
 	"market/internal/models"
 	"market/internal/watchdog"
 	"market/pkg/api"
+	"market/pkg/utils"
 	"net/http"
 	"os"
 
@@ -152,6 +153,72 @@ func (h *Handler) list(req *restful.Request, resp *restful.Response) {
 	resp.WriteEntity(models.NewResponse(api.OK, api.Success, models.NewListResultWithCount(appWithStatusList, res.TotalCount)))
 }
 
+func (h *Handler) menuTypes(req *restful.Request, resp *restful.Response) {
+	token := getToken(req)
+	if token == "" {
+		api.HandleUnauthorized(resp, errors.New("access token not found"))
+		return
+	}
+
+	res, err := appmgr.GetAppTypes()
+	if err != nil {
+		api.HandleError(resp, err)
+		return
+	}
+
+	types := parseAppTypes(res)
+
+	menuTypeData := models.MenuTypeResponseData{
+		MenuTypes: []models.MenuType{
+			{Label: "discover", Key: "Home", Icon: "sym_r_radar"},
+		},
+		I18n: models.Localization{
+			ZhCN: models.MainData{
+				Discover: "发现",
+			},
+			EnUS: models.MainData{
+				Discover: "Discover",
+			},
+		},
+	}
+
+	if utils.Contains(types, "Productivity") {
+		menuTypeData.MenuTypes = append(menuTypeData.MenuTypes, models.MenuType{Label: "productivity", Key: "Productivity", Icon: "sym_r_business_center"})
+		menuTypeData.I18n.ZhCN.Productivity = "效率"
+		menuTypeData.I18n.EnUS.Productivity = "Productivity"
+	}
+
+	if utils.Contains(types, "Utilities") {
+		menuTypeData.MenuTypes = append(menuTypeData.MenuTypes, models.MenuType{Label: "utilities", Key: "Utilities", Icon: "sym_r_extension"})
+		menuTypeData.I18n.ZhCN.Utilities = "实用工具"
+		menuTypeData.I18n.EnUS.Utilities = "Utilities"
+	}
+
+	if utils.Contains(types, "Entertainment") {
+		menuTypeData.MenuTypes = append(menuTypeData.MenuTypes, models.MenuType{Label: "entertainment", Key: "Entertainment", Icon: "sym_r_interests"})
+		menuTypeData.I18n.ZhCN.Entertainment = "娱乐"
+		menuTypeData.I18n.EnUS.Entertainment = "Entertainment"
+	}
+
+	if utils.Contains(types, "Social Network") {
+		menuTypeData.MenuTypes = append(menuTypeData.MenuTypes, models.MenuType{Label: "socialNetwork", Key: "Social Network", Icon: "sym_r_group"})
+		menuTypeData.I18n.ZhCN.SocialNetwork = "社交网络"
+		menuTypeData.I18n.EnUS.SocialNetwork = "Social network"
+	}
+
+	if utils.Contains(types, "Blockchain") {
+		menuTypeData.MenuTypes = append(menuTypeData.MenuTypes, models.MenuType{Label: "blockchain", Key: "Blockchain", Icon: "sym_r_stack"})
+		menuTypeData.I18n.ZhCN.Blockchain = "区块链"
+		menuTypeData.I18n.EnUS.Blockchain = "Blockchain"
+	}
+
+	menuTypeData.MenuTypes = append(menuTypeData.MenuTypes, models.MenuType{Label: "recommendation", Key: "Recommend", Icon: "sym_r_featured_play_list"})
+	menuTypeData.I18n.ZhCN.Recommendation = "推荐"
+	menuTypeData.I18n.EnUS.Recommendation = "Recommendation"
+
+	resp.WriteEntity(models.NewResponse(api.OK, api.Success, menuTypeData))
+}
+
 func (h *Handler) listTop(req *restful.Request, resp *restful.Response) {
 	token := getToken(req)
 	if token == "" {
@@ -409,7 +476,7 @@ func (h *Handler) info(req *restful.Request, resp *restful.Response) {
 		info = infoMarket
 		info.Status = models.AppUninstalled
 	}
-	
+
 	resp.WriteEntity(models.NewResponse(api.OK, api.Success, info))
 }
 
diff --git a/pkg/apiserver/service/v1/handler_apps.go b/pkg/apiserver/service/v1/handler_apps.go
index 4eb7c2f..821e42b 100644
--- a/pkg/apiserver/service/v1/handler_apps.go
+++ b/pkg/apiserver/service/v1/handler_apps.go
@@ -3,15 +3,15 @@ package v1
 import (
 	"errors"
 	"fmt"
+	"github.com/emicklei/go-restful/v3"
 	"github.com/golang/glog"
+	"k8s.io/klog/v2"
 	"market/internal/appmgr"
 	"market/internal/appservice"
 	"market/internal/boltdb"
 	"market/internal/constants"
 	"market/internal/models"
 	"market/pkg/api"
-
-	"github.com/emicklei/go-restful/v3"
 )
 
 func (h *Handler) handleInfos(req *restful.Request, resp *restful.Response) {
@@ -146,3 +146,84 @@ func (h *Handler) appsList(req *restful.Request, resp *restful.Response) {
 		return
 	}
 }
+
+func (h *Handler) handleI18ns(req *restful.Request, resp *restful.Response) {
+	token := getToken(req)
+	if token == "" {
+		api.HandleUnauthorized(resp, errors.New("access token not found"))
+		return
+	}
+	//names := []string{"astral", "market", "firefox"}
+	names := []string{}
+	infosMarket, err := appmgr.GetAppInfos(names)
+	if err != nil {
+		api.HandleError(resp, err)
+		return
+	}
+	//klog.Infof("infosMarket: %#v", infosMarket)
+
+	infosLocal, err := boltdb.GetLocalAppInfoMap()
+	if err != nil {
+		api.HandleError(resp, err)
+		return
+	}
+
+	//klog.Infof("infosLocal: %#v", infosLocal["firefox"])
+
+	i18nList := make([]map[string]map[string]models.I18n, 0)
+
+	i18nMap := make(map[string]map[string]models.I18n)
+	for name, info := range infosMarket {
+		klog.Infof("market xxxxx: name: %v, i18n: %v", info.Name, info.I18n)
+		i18nMap[name] = info.I18n
+	}
+	for name, info := range infosLocal {
+		klog.Infof("local xxxxx: name: %v, i18n: %v", info.Name, info.I18n)
+
+		i18nMap[name] = info.I18n
+	}
+
+	klog.Infof("i18nMap: %#v", i18nMap)
+
+	for name, i18n := range i18nMap {
+		i18nList = append(i18nList, map[string]map[string]models.I18n{
+			name: i18n,
+		})
+	}
+	klog.Infof("i18nList: %#v", i18nList)
+
+
+	resp.WriteEntity(models.NewResponse(api.OK, api.Success, i18nList))
+}
+
+func (h *Handler) handleI18n(req *restful.Request, resp *restful.Response) {
+	token := getToken(req)
+	if token == "" {
+		api.HandleUnauthorized(resp, errors.New("access token not found"))
+		return
+	}
+	name := req.PathParameter(ParamAppName)
+	names := []string{name}
+	infosMarket, err := appmgr.GetAppInfos(names)
+	if err != nil {
+		api.HandleError(resp, err)
+		return
+	}
+	klog.Infof("infosMarket: %#v", infosMarket)
+
+	infosLocal, err := boltdb.GetLocalAppInfoMap()
+	if err != nil {
+		api.HandleError(resp, err)
+		return
+	}
+
+	i18nMap := make(map[string]map[string]models.I18n)
+	for name, info := range infosMarket {
+		i18nMap[name] = info.I18n
+	}
+	for name, info := range infosLocal {
+		i18nMap[name] = info.I18n
+	}
+
+	resp.WriteEntity(models.NewResponse(api.OK, api.Success, i18nMap))
+}
diff --git a/pkg/apiserver/service/v1/handler_dev.go b/pkg/apiserver/service/v1/handler_dev.go
index a31e20a..a62ccd5 100644
--- a/pkg/apiserver/service/v1/handler_dev.go
+++ b/pkg/apiserver/service/v1/handler_dev.go
@@ -204,6 +204,11 @@ func (h *Handler) devUpload(req *restful.Request, resp *restful.Response) {
 		info.Source = constants.AppFromDev
 	}
 
+	i18n := appmgr.GetAppI18n(info.ChartName, info.Locale)
+	if len(i18n) > 0 {
+		info.I18n = i18n
+	}
+
 	err = boltdb.UpsertLocalAppInfo(info)
 	if err != nil {
 		glog.Warningf("UpsertLocalAppInfo err:%s", err.Error())
diff --git a/pkg/apiserver/service/v1/handler_install.go b/pkg/apiserver/service/v1/handler_install.go
index 5696086..32a014b 100644
--- a/pkg/apiserver/service/v1/handler_install.go
+++ b/pkg/apiserver/service/v1/handler_install.go
@@ -78,6 +78,10 @@ func installPre(appName, token string) (*models.ApplicationInfo, error) {
 	if err != nil {
 		return info, err
 	}
+	i18n := appmgr.GetAppI18n(info.ChartName, info.Locale)
+	if len(i18n) > 0 {
+		info.I18n = i18n
+	}
 
 	info.Source = constants.AppFromMarket
 	err = boltdb.UpsertLocalAppInfo(info)
diff --git a/pkg/apiserver/service/v1/handler_upgrade.go b/pkg/apiserver/service/v1/handler_upgrade.go
index 26a63f4..e61d11f 100644
--- a/pkg/apiserver/service/v1/handler_upgrade.go
+++ b/pkg/apiserver/service/v1/handler_upgrade.go
@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/emicklei/go-restful/v3"
-	"github.com/golang/glog"
 	"market/internal/appmgr"
 	"market/internal/appservice"
 	"market/internal/boltdb"
@@ -14,6 +12,9 @@ import (
 	"market/internal/watchdog"
 	"market/pkg/api"
 	"market/pkg/utils"
+
+	"github.com/emicklei/go-restful/v3"
+	"github.com/golang/glog"
 )
 
 func getVersionAndInfo(appName, token string) (curVersion string, latestInfo *models.ApplicationInfo, err error) {
@@ -71,6 +72,10 @@ func (h *Handler) upgrade(req *restful.Request, resp *restful.Response) {
 		api.HandleError(resp, err)
 		return
 	}
+	i18n := appmgr.GetAppI18n(latestInfo.ChartName, latestInfo.Locale)
+	if len(i18n) > 0 {
+		latestInfo.I18n = i18n
+	}
 
 	latestInfo.Source = constants.AppFromMarket
 	err = boltdb.UpsertLocalAppInfo(latestInfo)
diff --git a/pkg/apiserver/service/v1/helper.go b/pkg/apiserver/service/v1/helper.go
index 0cb503f..543ce61 100644
--- a/pkg/apiserver/service/v1/helper.go
+++ b/pkg/apiserver/service/v1/helper.go
@@ -3,7 +3,6 @@ package v1
 import (
 	"encoding/json"
 	"fmt"
-	helmtime "helm.sh/helm/v3/pkg/time"
 	"market/internal/appservice"
 	"market/internal/boltdb"
 	"market/internal/conf"
@@ -13,6 +12,8 @@ import (
 	"market/pkg/api"
 	"net/http"
 
+	helmtime "helm.sh/helm/v3/pkg/time"
+
 	"github.com/emicklei/go-restful/v3"
 	"github.com/golang/glog"
 )
@@ -146,6 +147,20 @@ func getModelsMap(token string) (map[string]*models.ModelStatusResponse, error)
 	return appservice.ParseLlmsListToMap(jsonStr)
 }
 
+func parseAppTypes(res *models.ListResultD) []string {
+	var stringItems []string
+	for _, rawMsg := range res.Items {
+		var str string
+		err := json.Unmarshal(rawMsg, &str)
+		if err != nil {
+			fmt.Println("Error unmarshalling:", err)
+			continue
+		}
+		stringItems = append(stringItems, str)
+	}
+	return stringItems
+}
+
 func parseAppInfos(res *models.ListResultD, appsMap map[string]appservice.Application, workflowMap map[string]*models.StatusData, middlewareMap map[string]*models.StatusData) []*models.ApplicationInfo {
 
 	var appWithStatusList []*models.ApplicationInfo
diff --git a/pkg/apiserver/service/v1/register.go b/pkg/apiserver/service/v1/register.go
index 57329e1..964996b 100644
--- a/pkg/apiserver/service/v1/register.go
+++ b/pkg/apiserver/service/v1/register.go
@@ -62,6 +62,12 @@ func AddToContainer(c *restful.Container) error {
 		Param(ws.QueryParameter("type", "type")).
 		Returns(http.StatusOK, "success to get application list", &models.ListResponse{}))
 
+	ws.Route(ws.GET("/applications/menutypes").
+		To(handler.menuTypes).
+		Doc("get menu types list").
+		Metadata(restfulspec.KeyOpenAPITags, ModuleTags).
+		Returns(http.StatusOK, "success to get top application list", &models.MenuTypeResponse{}))
+
 	ws.Route(ws.GET("/applications/top").
 		To(handler.listTop).
 		Doc("get top application list").
@@ -148,6 +154,20 @@ func AddToContainer(c *restful.Container) error {
 		Metadata(restfulspec.KeyOpenAPITags, ModuleTags).
 		Returns(http.StatusOK, "success to get app infos by names", nil))
 
+	ws.Route(ws.GET("/applications/i18ns").
+		To(handler.handleI18ns).
+		Doc("get apps i18n").
+		Reads([]string{}).
+		Metadata(restfulspec.KeyOpenAPITags, ModuleTags).
+		Returns(http.StatusOK, "success to get app i18n by names", nil))
+
+	ws.Route(ws.GET("/applications/i18ns/{"+ParamAppName+"}").
+		To(handler.handleI18n).
+		Param(ws.PathParameter(ParamAppName, "the name of the application")).
+		Doc("get application i18n by name").
+		Metadata(restfulspec.KeyOpenAPITags, ModuleTags).
+		Returns(http.StatusOK, "success to get application i18n by name", nil))
+
 	ws.Route(ws.GET("/workflow/recommend/detail").
 		To(handler.workflowRecommendsDetail).
 		Param(ws.QueryParameter("category", "category")).
diff --git a/pkg/utils/tools.go b/pkg/utils/tools.go
index 5f94b0d..d0354e0 100644
--- a/pkg/utils/tools.go
+++ b/pkg/utils/tools.go
@@ -23,8 +23,10 @@ import (
 	"market/internal/constants"
 	"math/rand"
 	"os"
+	"path"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/golang/glog"
@@ -167,3 +169,32 @@ func Md5String(s string) string {
 	hashString := hex.EncodeToString(hash[:])
 	return hashString
 }
+
+func FindChartPath(chartDirPath string) string {
+	charts, err := os.ReadDir(chartDirPath)
+	if err != nil {
+		glog.Warningf("read dir %s error: %s", chartDirPath, err.Error())
+		return ""
+	}
+
+	for _, c := range charts {
+		if !c.IsDir() || strings.HasPrefix(c.Name(), ".") {
+			continue
+		}
+		appCfgFullName := path.Join(chartDirPath, c.Name(), constants.AppCfgFileName)
+		if PathExists(appCfgFullName) {
+			return path.Join(chartDirPath, c.Name())
+		}
+	}
+
+	return ""
+}
+
+func Contains(slice []string, item string) bool {
+	for _, element := range slice {
+		if element == item {
+			return true
+		}
+	}
+	return false
+}