From 00cea34ddef406bf937a1202795a2eb90ac436d2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 21 Jan 2025 13:55:20 +0100
Subject: [PATCH] perf: use util in OutLayout

---
 src/components/UserPanel.vue | 14 +++++---------
 src/layouts/OutLayout.vue    | 15 ++++-----------
 src/utils/quasarLang.js      | 12 ++++++++++++
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 src/utils/quasarLang.js

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 110828f55..5f3266eb2 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -1,6 +1,9 @@
 <script setup>
+import quasarLang from 'src/utils/quasarLang';
+
 import { onMounted, computed, ref } from 'vue';
-import { Dark, Quasar } from 'quasar';
+
+import { Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
@@ -22,7 +25,6 @@ const { t, locale } = useI18n();
 const { copyText } = useClipboard();
 const { notify } = useNotify();
 
-const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
 const userLocale = computed({
     get() {
         return locale.value;
@@ -32,13 +34,7 @@ const userLocale = computed({
 
         value = localeEquivalence[value] ?? value;
 
-        try {
-            langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
+        quasarLang(value);
     },
 });
 
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index 0eb1329a4..4ccc6bf9e 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -2,6 +2,8 @@
 import { Dark, Quasar } from 'quasar';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { localeEquivalence } from 'src/i18n/index';
+import quasarLang from 'src/utils/quasarLang';
 
 const { t, locale } = useI18n();
 
@@ -12,18 +14,9 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        if (value === 'en') value = 'en-GB';
+        value = localeEquivalence[value] ?? value;
 
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
-        try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
+        quasarLang(value);
     },
 });
 
diff --git a/src/utils/quasarLang.js b/src/utils/quasarLang.js
new file mode 100644
index 000000000..ebd590c05
--- /dev/null
+++ b/src/utils/quasarLang.js
@@ -0,0 +1,12 @@
+const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
+import { Quasar } from 'quasar';
+
+export default function (value) {
+    try {
+        langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
+            Quasar.lang.set(lang.default);
+        });
+    } catch (error) {
+        //
+    }
+}