Merge remote-tracking branch 'origin/development'

src/locale/bn.json

@@ -92,8 +92,6 @@
   "setting.refund": "রিটার্ন ও ফেরত নীতি",
   "setting.logout": "লগ আউট",
   "setting.version": "ভার্সন {0}",
-  "setting.lang.en": "ইংরেজি",
-  "setting.lang.bn": "বাংলা",
   "home.missionCenter": "মিশন\nসেন্টার",
   "home.refer&earn": "রেফার\nএবং আয়",
   "home.vip": "ভিআইপি\nসদস্যতা",

src/locale/en.json

@@ -92,8 +92,6 @@
   "setting.refund": "Return & Refund Policy",
   "setting.logout": "Logout",
   "setting.version": "Version {0}",
-  "setting.lang.en": "English",
-  "setting.lang.bn": "Bengali",
   "home.missionCenter": "Mission\nCenter",
   "home.refer&earn": "Refer\n&Earn",
   "home.vip": "VIP\nMembership",

src/locale/index.ts

@@ -13,7 +13,7 @@ const messages = {
   bn,
 }
 const i18n = createI18n({
-  locale: uni.getLocale() === 'bn' ? 'bn' : 'en', // 获取已设置的语言，fallback 语言需要再 manifest.config.ts 中设置
+  locale: uni.getLocale() === 'bn' ? 'bn' : 'bn', // 获取已设置的语言，fallback 语言需要再 manifest.config.ts 中设置
   messages,
   allowComposition: true,
 })

src/locale/zh-Hans.json

@@ -92,8 +92,6 @@
   "setting.refund": "退货退款政策",
   "setting.logout": "退出登录",
   "setting.version": "版本 {0}",
-  "setting.lang.en": "英语",
-  "setting.lang.bn": "孟加拉语",
   "home.missionCenter": "任务中心",
   "home.refer&earn": "推荐赚钱",
   "home.vip": "VIP会员",

src/pages/mine/setting.vue

@@ -19,14 +19,12 @@ defineOptions({
 })
 const userStore = useUserStore()
 const columns = computed(() => {
-  const _locale = i18n.global.locale
-  void _locale
   return [
-    { label: t('setting.lang.en'), value: 'en' },
-    { label: t('setting.lang.bn'), value: 'bn' },
+    { label: 'English', value: 'en' },
+    { label: 'বাংলা', value: 'bn' },
   ]
 })
-const language = ref(uni.getLocale() === 'bn' ? 'bn' : 'en')
+const language = ref(uni.getLocale() === 'bn' ? 'bn' : 'bn')
 function changeLanguage(data: any) {
   console.log(data)
   // 下面2句缺一不可！！！