From d82c1626d89ae33e45ad693814914dce0bbb50ad Mon Sep 17 00:00:00 2001
From: krank <emosick@qq.com>
Date: Mon, 5 Aug 2024 00:06:22 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feature=EF=BC=9A=20=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/i18n/selctLanguage.vue | 75 ++++++++++++++++++++
 web/src/view/layout/header/tools.vue      | 76 +++-----------------
 web/src/view/login/index.vue              | 84 +++--------------------
 3 files changed, 92 insertions(+), 143 deletions(-)
 create mode 100644 web/src/components/i18n/selctLanguage.vue

diff --git a/web/src/components/i18n/selctLanguage.vue b/web/src/components/i18n/selctLanguage.vue
new file mode 100644
index 000000000..4f8544b25
--- /dev/null
+++ b/web/src/components/i18n/selctLanguage.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-dropdown
+      trigger="click"
+      @command="handleSetLanguage"
+  >
+    <slot name="info"></slot>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item
+            :disabled="$i18n.locale==='en'"
+            command="en"
+        >
+          <img
+              alt="English" class="w-8 mr-1"
+              src="@/assets/flags/en.svg"
+          >English
+        </el-dropdown-item>
+        <el-dropdown-item
+            :disabled="$i18n.locale==='zh'"
+            command="zh"
+        ><img
+            alt="中文" class="w-8 mr-1"
+            src="@/assets/flags/zh.svg"
+        >中文
+        </el-dropdown-item>
+        <el-dropdown-item
+            :disabled="$i18n.locale==='ar'"
+            command="ar"
+        ><img
+            alt="العربية" class="w-8 mr-1"
+            src="@/assets/flags/ar.svg"
+        >العربية
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+
+<script setup>
+import Cookies from 'js-cookie' // added by mohamed hassan to support multilanguage
+import {useI18n} from 'vue-i18n'
+import {ElMessage} from "element-plus"; // added by mohamed hassan to support multilanguage
+const i18n = useI18n() // added by mohamed hassan to support multilanguage
+const {t} = useI18n() // added by mohamed hassan to support multilanguage
+import {useUserStore} from '@/pinia/modules/user'
+
+import {emitter} from "@/utils/bus";
+
+const userStore = useUserStore()
+
+const toggleRefresh = () =>{
+  emitter.emit('reload')
+  setTimeout(() => {
+  }, 300);
+}
+const handleSetLanguage = (lang) => {
+  toggleRefresh()
+  i18n.locale.value = lang
+  userStore.setLanguage(lang)
+  Cookies.set('language', lang)
+
+  ElMessage({
+    message: t('general.langSwitch'),
+    type: 'success'
+  })
+
+
+}
+
+</script>
+
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/web/src/view/layout/header/tools.vue b/web/src/view/layout/header/tools.vue
index c3977f232..63dc4ebde 100644
--- a/web/src/view/layout/header/tools.vue
+++ b/web/src/view/layout/header/tools.vue
@@ -63,32 +63,13 @@
       placement="bottom"
       :disabled="appStore.theme === 'auto'"
     >
-      <el-dropdown
-        @command="handleSetLanguage"
-      >
-        <el-icon class="w-8 h-8 shadow rounded-full border border-gray-200 cursor-pointer border-solid" @click="appStore.toggleLang">
-          <language />
-        </el-icon>
-        <template #dropdown>
-          <el-dropdown-menu>
-            <el-dropdown-item
-              command="zh"
-            >
-              简体中文
-            </el-dropdown-item>
-            <el-dropdown-item
-              command="en"
-            >
-              English
-            </el-dropdown-item>
-            <el-dropdown-item
-              command="ar"
-            >
-              العربية
-            </el-dropdown-item>
-          </el-dropdown-menu>
+      <SelectLang>
+        <template v-slot:info>
+          <el-icon class="w-8 h-8 shadow rounded-full border border-gray-200 cursor-pointer border-solid" @click="appStore.toggleLang">
+            <language />
+          </el-icon>
         </template>
-      </el-dropdown>
+      </SelectLang>
     </el-tooltip>
 
     <gva-setting v-model:drawer="showSettingDrawer" />
@@ -104,13 +85,10 @@ import { ref } from "vue"
 import { emitter } from "@/utils/bus.js";
 import CommandMenu from "@/components/commandMenu/index.vue";
 import { useI18n } from 'vue-i18n'
-import Cookies from "js-cookie";
-import {ElMessage} from "element-plus"; // added by mohamed hassan to support multilanguage
-const i18n = useI18n() // added by mohamed hassan to support multilanguage
-import { useUserStore } from '@/pinia/modules/user'
-const userStore = useUserStore()
 const { t } = useI18n() // added by mohamed hassan to support multilanguage
 
+import SelectLang from '@/components/i18n/selctLanguage.vue'
+
 const appStore = useAppStore()
 const showSettingDrawer = ref(false)
 const showRefreshAnmite = ref(false)
@@ -151,44 +129,6 @@ const initPage = () => {
   window.addEventListener("keydown", handleKeyDown);
 };
 
-const handleSetLanguage = (lang) => {
-  // console.log('handleSetLanguage() called with value: ' + lang)
-  i18n.locale.value = lang
-
-  userStore.setLanguage(lang)
-
-  // console.log('userStore handleSetLanguage() called with value: ' + userStore.getLanguage())
-
-  Cookies.set('language', lang)
-
-  // if (lang === 'ar') {
-  //   console.log('Arabic language selected changing to RTL')
-  //   document.querySelector('html').classList.add('is-rtl')
-  // } else {
-  //   console.log('Non Arabic language selected changing to LTR')
-  //   document.querySelector('html').classList.add('is-ltr')
-  // }
-
-  // const htmlEl = document.querySelector('html')
-
-  // if (this.$i18n.locale === 'ar') {
-  //   console.log('change language to arabic and ltr to rtl')
-  //   htmlEl.setAttribute('dir', 'rtl')
-  // } else {
-  //   console.log('change language to english and rtl to ltr')
-  //   htmlEl.setAttribute('dir', 'ltr')
-  // }
-
-  // htmlEl.setAttribute('lang', lang)
-
-  ElMessage({
-    message: t('general.langSwitch'),
-    type: 'success'
-  })
-
-  // this.$emit('handerevent')
-  window.location.reload()
-}
 
 initPage();
 
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index 6fcadc5cb..c47d53456 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -25,44 +25,13 @@
               </p>
             </div>
             <div class="flex justify-end">
-              <el-dropdown
-                trigger="click"
-                @command="handleSetLanguage"
-              >
-                <span class="cursor-pointer mb-2">
-                  <img
-                    src="@/assets/language.svg" alt = "Languages"
-                    style="width: 30px; height: 30px;"
-                  >
-                </span>
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item
-                      :disabled="$i18n.locale==='en'"
-                      command="en"
-                    >
-                      <img
-                          src="@/assets/flags/en.svg" alt = "English"
-                          class="w-8 mr-1"
-                      >English
-                      </el-dropdown-item>
-                    <el-dropdown-item
-                      :disabled="$i18n.locale==='zh'"
-                      command="zh"
-                    ><img
-                      src="@/assets/flags/zh.svg" alt = "中文"
-                      class="w-8 mr-1"
-                    >中文</el-dropdown-item>
-                    <el-dropdown-item
-                      :disabled="$i18n.locale==='ar'"
-                      command="ar"
-                    ><img
-                      src="@/assets/flags/ar.svg" alt = "العربية"
-                      class="w-8 mr-1"
-                    >العربية</el-dropdown-item>
-                  </el-dropdown-menu>
+              <SelectLang>
+                <template v-slot:info>
+                  <span class="cursor-pointer mb-2">
+                    <img alt="Languages" src="@/assets/language.svg" style="width: 30px; height: 30px;">
+                  </span>
                 </template>
-              </el-dropdown>
+              </SelectLang>
             </div>
             <el-form
               ref="loginForm"
@@ -203,9 +172,11 @@ import { useUserStore } from '@/pinia/modules/user'
 import Cookies from 'js-cookie' // added by mohamed hassan to support multilanguage
 import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
 
-const i18n = useI18n() // added by mohamed hassan to support multilanguage
 const { t } = useI18n() // added by mohamed hassan to support multilanguage
 
+import SelectLang from '@/components/i18n/selctLanguage.vue'
+
+
 defineOptions({
   name: "Login",
 })
@@ -323,41 +294,4 @@ const checkInit = async() => {
   }
 }
 
-const handleSetLanguage = (lang) => {
-  // console.log('handleSetLanguage() called with value: ' + lang)
-  i18n.locale.value = lang
-
-  userStore.setLanguage(lang)
-
-  // console.log('userStore handleSetLanguage() called with value: ' + userStore.getLanguage())
-
-  Cookies.set('language', lang)
-
-  // if (lang === 'ar') {
-  //   console.log('Arabic language selected changing to RTL')
-  //   document.querySelector('html').classList.add('is-rtl')
-  // } else {
-  //   console.log('Non Arabic language selected changing to LTR')
-  //   document.querySelector('html').classList.add('is-ltr')
-  // }
-
-  // const htmlEl = document.querySelector('html')
-
-  // if (this.$i18n.locale === 'ar') {
-  //   console.log('change language to arabic and ltr to rtl')
-  //   htmlEl.setAttribute('dir', 'rtl')
-  // } else {
-  //   console.log('change language to english and rtl to ltr')
-  //   htmlEl.setAttribute('dir', 'ltr')
-  // }
-
-  // htmlEl.setAttribute('lang', lang)
-
-  ElMessage({
-    message: t('general.langSwitch'),
-    type: 'success'
-  })
-
-  // this.$emit('handerevent')
-}
 </script>

From 029a19766802475ff0082579c54bf48e9a8bd6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= <flipped_aurora@163.com>
Date: Mon, 5 Aug 2024 11:54:33 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fixed:=20=E4=BF=AE=E5=A4=8Di18n=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=BC=B9=E5=87=BA=E6=8A=A5=E9=94=99=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/utils/request.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index 6d25c91a5..93e728335 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -105,7 +105,6 @@ service.interceptors.response.use(
       })
       return
     }
-
     switch (error.response.status) {
       case 500:
         ElMessageBox.confirm(`
@@ -114,8 +113,8 @@ service.interceptors.response.use(
         `, '接口报错', {
           dangerouslyUseHTMLString: true,
           distinguishCancelAndClose: true,
-          confirmButtonText: i18n.t('general.confirm'),
-          cancelButtonText: i18n.t('general.cancel')
+          confirmButtonText: i18n.global.t('general.confirm'),
+          cancelButtonText: i18n.global.t('general.cancel')
         })
           .then(() => {
             const userStore = useUserStore()
@@ -130,8 +129,8 @@ service.interceptors.response.use(
           `, '接口报错', {
           dangerouslyUseHTMLString: true,
           distinguishCancelAndClose: true,
-          confirmButtonText: i18n.t('general.confirm'),
-          cancelButtonText: i18n.t('general.cancel')
+          confirmButtonText: i18n.global.t('general.confirm'),
+          cancelButtonText: i18n.global.t('general.cancel')
         })
         break
       case 401:

From 52954e6116e7611a73d4a0fb934dd0cb89cc822f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:57:39 +0800
Subject: [PATCH 3/7] Update selctLanguage.vue

---
 web/src/components/i18n/selctLanguage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/i18n/selctLanguage.vue b/web/src/components/i18n/selctLanguage.vue
index 4f8544b25..027aebd4f 100644
--- a/web/src/components/i18n/selctLanguage.vue
+++ b/web/src/components/i18n/selctLanguage.vue
@@ -3,7 +3,7 @@
       trigger="click"
       @command="handleSetLanguage"
   >
-    <slot name="info"></slot>
+    <slot></slot>
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item

From a08fe37cbbc4afdc90276181d5803ff0d78659e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:58:04 +0800
Subject: [PATCH 4/7] Update tools.vue

---
 web/src/view/layout/header/tools.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/src/view/layout/header/tools.vue b/web/src/view/layout/header/tools.vue
index 63dc4ebde..9c2389d24 100644
--- a/web/src/view/layout/header/tools.vue
+++ b/web/src/view/layout/header/tools.vue
@@ -64,11 +64,9 @@
       :disabled="appStore.theme === 'auto'"
     >
       <SelectLang>
-        <template v-slot:info>
           <el-icon class="w-8 h-8 shadow rounded-full border border-gray-200 cursor-pointer border-solid" @click="appStore.toggleLang">
             <language />
           </el-icon>
-        </template>
       </SelectLang>
     </el-tooltip>
 

From 7ae13d40b829fb6bb12d22685a23d1ea48052a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:58:39 +0800
Subject: [PATCH 5/7] Update index.vue

---
 web/src/view/login/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index c47d53456..af43d3a28 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -26,11 +26,9 @@
             </div>
             <div class="flex justify-end">
               <SelectLang>
-                <template v-slot:info>
                   <span class="cursor-pointer mb-2">
                     <img alt="Languages" src="@/assets/language.svg" style="width: 30px; height: 30px;">
                   </span>
-                </template>
               </SelectLang>
             </div>
             <el-form

From 7d5b57492ed8be2bff2071bc1582735ee5726d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= <flipped_aurora@163.com>
Date: Mon, 5 Aug 2024 13:38:11 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feature:=20=E4=B8=BAselectLanguage=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0success=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i18n/{selctLanguage.vue => selectLanguage.vue}  | 13 +++----------
 web/src/view/layout/header/tools.vue                |  8 ++++++--
 web/src/view/login/index.vue                        |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)
 rename web/src/components/i18n/{selctLanguage.vue => selectLanguage.vue} (92%)

diff --git a/web/src/components/i18n/selctLanguage.vue b/web/src/components/i18n/selectLanguage.vue
similarity index 92%
rename from web/src/components/i18n/selctLanguage.vue
rename to web/src/components/i18n/selectLanguage.vue
index 027aebd4f..a721203be 100644
--- a/web/src/components/i18n/selctLanguage.vue
+++ b/web/src/components/i18n/selectLanguage.vue
@@ -44,17 +44,11 @@ const i18n = useI18n() // added by mohamed hassan to support multilanguage
 const {t} = useI18n() // added by mohamed hassan to support multilanguage
 import {useUserStore} from '@/pinia/modules/user'
 
-import {emitter} from "@/utils/bus";
-
 const userStore = useUserStore()
 
-const toggleRefresh = () =>{
-  emitter.emit('reload')
-  setTimeout(() => {
-  }, 300);
-}
+const emit = defineEmits(["success"])
+
 const handleSetLanguage = (lang) => {
-  toggleRefresh()
   i18n.locale.value = lang
   userStore.setLanguage(lang)
   Cookies.set('language', lang)
@@ -63,8 +57,7 @@ const handleSetLanguage = (lang) => {
     message: t('general.langSwitch'),
     type: 'success'
   })
-
-
+  emit('success')
 }
 
 </script>
diff --git a/web/src/view/layout/header/tools.vue b/web/src/view/layout/header/tools.vue
index 1c5daa0ed..f9377b96c 100644
--- a/web/src/view/layout/header/tools.vue
+++ b/web/src/view/layout/header/tools.vue
@@ -82,7 +82,7 @@
       placement="bottom"
       :disabled="appStore.theme === 'auto'"
     >
-      <SelectLang>
+      <SelectLang @success="changeSuccess">
           <el-icon class="w-8 h-8 shadow rounded-full border border-gray-200 cursor-pointer border-solid" @click="appStore.toggleLang">
             <language />
           </el-icon>
@@ -104,7 +104,7 @@ import CommandMenu from "@/components/commandMenu/index.vue";
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n() // added by mohamed hassan to support multilanguage
 
-import SelectLang from '@/components/i18n/selctLanguage.vue'
+import SelectLang from '@/components/i18n/selectLanguage.vue'
 
 const appStore = useAppStore()
 const showSettingDrawer = ref(false)
@@ -149,6 +149,10 @@ const initPage = () => {
 
 initPage();
 
+const changeSuccess = () => {
+  window.location.reload();
+}
+
 
 const videoList = [
   {
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index 296370e2f..0fe061690 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -172,7 +172,7 @@ import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multila
 
 const { t } = useI18n() // added by mohamed hassan to support multilanguage
 
-import SelectLang from '@/components/i18n/selctLanguage.vue'
+import SelectLang from '@/components/i18n/selectLanguage.vue'
 
 
 defineOptions({

From a0f9798157873123678073f4d35c6f97918d4ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= <flipped_aurora@163.com>
Date: Mon, 5 Aug 2024 13:48:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feature:=20=E5=89=94=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/init/index.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/web/src/view/init/index.vue b/web/src/view/init/index.vue
index abc8b4f1b..7651c3034 100644
--- a/web/src/view/init/index.vue
+++ b/web/src/view/init/index.vue
@@ -168,8 +168,6 @@ import { ElLoading, ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
 
-const i18n = useI18n() // added by mohamed hassan to support multilanguage
-
 const { t } = useI18n() // added by mohamed hassan to support multilanguage
 
 defineOptions({
@@ -318,10 +316,7 @@ const onSubmit = async() => {
     loading.close()
   }
 }
-// added by mohamed hassan to support multilanguage
-const changeLanguage = (val) => {
-  i18n.locale.value = val
-}
+
 </script>
 
 <style lang="scss" scoped>