From 12067371d018655bd880dd3e44c5262f16cf6c71 Mon Sep 17 00:00:00 2001
From: Mathieu Massaviol <mathieu.massaviol@univ-amu.fr>
Date: Fri, 8 Nov 2024 12:12:30 +0100
Subject: [PATCH] Refactor translateValue (by @mda) #29
---
src/composables/useTranslateValue.ts | 56 ++++++++++++++++++----------
1 file changed, 36 insertions(+), 20 deletions(-)
diff --git a/src/composables/useTranslateValue.ts b/src/composables/useTranslateValue.ts
index 200d5d9..8c97acb 100644
--- a/src/composables/useTranslateValue.ts
+++ b/src/composables/useTranslateValue.ts
@@ -1,6 +1,8 @@
import type { LocalizedProperty } from '@/declarations'
import { useI18n, type I18nScope } from 'vue-i18n'
+const CACHE_TRANSLATE_KEYVALUE = []
+
export function useTranslateValue(useScope: I18nScope = 'global') {
const { t, mergeLocaleMessage } = useI18n({
useScope
@@ -13,26 +15,40 @@ export function useTranslateValue(useScope: I18nScope = 'global') {
return localizedProperty
}
- // For each localized property of an external resource,
- // we add each localized value as a message in i18n.
- // We take the first found value as the message key,
- // this way, if we can't fallback to any locale, at least we
- // print a real message.
- const keyValue = Object.values(localizedProperty)[0]
-
- // when we have severeal values for one locale, we arbitrary
- // take the first one.
- const key: string = typeof keyValue === 'string' ? keyValue : keyValue[0]
-
- Object.keys(localizedProperty).forEach(function (locale) {
- if (Array.isArray(localizedProperty[locale])) {
- // when we have severeal values for one locale, we arbitrary
- // take the first one.
- mergeLocaleMessage(locale, { [key]: localizedProperty[locale][0] })
- } else {
- mergeLocaleMessage(locale, { [key]: localizedProperty[locale] })
- }
- });
+ let key: string
+
+ /**
+ * First time we find this localizedProperty
+ *
+ * We init it
+ */
+ const lpCached = CACHE_TRANSLATE_KEYVALUE.find(e => e.lp === localizedProperty)
+ if (!lpCached) {
+ // For each localized property of an external resource,
+ // we add each localized value as a message in i18n.
+ // We take the first found value as the message key,
+ // this way, if we can't fallback to any locale, at least we
+ // print a real message.
+ const keyValue = Object.values(localizedProperty)[0]
+
+ // when we have severeal values for one locale, we arbitrary
+ // take the first one.
+ key = typeof keyValue === 'string' ? keyValue : keyValue[0]
+
+ Object.keys(localizedProperty).forEach(function (locale) {
+ if (Array.isArray(localizedProperty[locale])) {
+ // when we have severeal values for one locale, we arbitrary
+ // take the first one.
+ mergeLocaleMessage(locale, { [key]: localizedProperty[locale][0] })
+ } else {
+ mergeLocaleMessage(locale, { [key]: localizedProperty[locale] })
+ }
+ });
+ CACHE_TRANSLATE_KEYVALUE.push({ keyValue, lp: localizedProperty })
+ } else {
+ const keyValue = lpCached.keyValue
+ key = typeof keyValue === 'string' ? keyValue : keyValue[0]
+ }
return t(key)
}
--
GitLab