From ac660fadd780dff8140e5d3820043cbef8ff7bc1 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 3 Jan 2024 09:17:28 +0100 Subject: [PATCH 1/4] refs #6098 feat: add translate for copyToken --- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 5e7e116c5..4e69f05b7 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -741,6 +741,7 @@ export default { components: { topbar: {}, userPanel: { + copyToken: 'Token copied to clipboard', settings: 'Settings', logOut: 'Log Out', }, diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 4e570e7b4..ae3b8f553 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -740,6 +740,7 @@ export default { components: { topbar: {}, userPanel: { + copyToken: 'Token copiado al portapapeles', settings: 'ConfiguraciĆ³n', logOut: 'Cerrar sesiĆ³n', }, From 899ccc097a91926c19d248695f3f30419a4939f9 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 3 Jan 2024 09:18:13 +0100 Subject: [PATCH 2/4] refs #6098 perf: remove import.meta.glob --- src/components/UserPanel.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index aee12d105..d02aa7c1f 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -22,14 +22,11 @@ const userLocale = computed({ if (value === 'en') value = 'en-GB'; - // 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) => { + import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => { Quasar.lang.set(lang.default); }); - } catch (error) { + } catch (error) { // } }, From b00b2941c7406413f08d0e4ff64888bad72cb53e Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 3 Jan 2024 09:18:35 +0100 Subject: [PATCH 3/4] refs #6098 perf: define locale equivalences in i18n folder --- src/components/UserPanel.vue | 11 ++++++++--- src/i18n/index.js | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index d02aa7c1f..e6251adc9 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -1,17 +1,18 @@ diff --git a/src/i18n/index.js b/src/i18n/index.js index 7344be49a..a375812df 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -1,6 +1,8 @@ import en from './en'; import es from './es'; - +export const localeEquivalence = { + 'en':'en-GB' +} export default { en: en, es: es, From c4cf9842cb8c24fd10a9298f24b12ec2ec895a13 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 3 Jan 2024 09:39:28 +0100 Subject: [PATCH 4/4] refs #6098 perf: add vite-ignore --- src/components/UserPanel.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index e6251adc9..f512ac4c4 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -24,6 +24,7 @@ const userLocale = computed({ value = localeEquivalence[value] ?? value try { + /* @vite-ignore */ import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => { Quasar.lang.set(lang.default); });