From 11d900e7f7c1d4b09b6ea72ff702d82b5c1c8bd5 Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Thu, 5 Sep 2024 21:16:24 +0200
Subject: [PATCH] Added compact translations for date duration

---
 components/calendar/CalendarEventDetails.vue  |  4 +---
 .../calendar/search/lists/EventCallout.vue    |  4 +---
 i18n.config.ts                                | 16 ++++++++++++++++
 stores/CalendarStore.ts                       | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue
index 5445968..910068b 100644
--- a/components/calendar/CalendarEventDetails.vue
+++ b/components/calendar/CalendarEventDetails.vue
@@ -30,9 +30,7 @@ const eventDetails = ref<HTMLElement>()
 const emit = defineEmits(["query:close-popover"])
 
 const dateDifference: string = getRelativeString(defaultDate, props.event.startDate)
-const dateDuration: string | null = props.event.endDate
-  ? getRelativeString(props.event.startDate, props.event.endDate, "compact")
-  : null
+const dateDuration = computed<string | null>(() => props.event.endDate ? getRelativeString(props.event.startDate, props.event.endDate, "compact") : null)
 
 function handleJumpToDate(date: RPGDate) {
   jumpToDate(date)
diff --git a/components/calendar/search/lists/EventCallout.vue b/components/calendar/search/lists/EventCallout.vue
index 2d3965d..87fb8e4 100644
--- a/components/calendar/search/lists/EventCallout.vue
+++ b/components/calendar/search/lists/EventCallout.vue
@@ -16,9 +16,7 @@ defineEmits<{
 const { getRelativeString, defaultDate, getFormattedDateTitle } = useCalendar()
 
 const dateDifference: string = getRelativeString(defaultDate, props.event.startDate)
-const dateDuration: string | null = props.event.endDate
-  ? getRelativeString(props.event.startDate, props.event.endDate, "compact")
-  : null
+const dateDuration = computed<string | null>(() => props.event.endDate ? getRelativeString(props.event.startDate, props.event.endDate, "compact") : null)
 </script>
 
 <template>
diff --git a/i18n.config.ts b/i18n.config.ts
index f8da943..669723c 100644
--- a/i18n.config.ts
+++ b/i18n.config.ts
@@ -70,10 +70,18 @@ export default defineI18nConfig(() => ({
             xMonthsNext: "In {months} month(s)",
             xYearsNext: "In {years} year(s)",
             xYearsAndMonthsNext: "In {years} year(s) and {months} month(s)",
+            xDaysNextCompact: "{days} days",
+            xMonthsNextCompact: "{months} month(s)",
+            xYearsNextCompact: "{years} year(s)",
+            xYearsAndMonthsNextCompact: "{years} year(s) and {months} month(s)",
             xDaysAgo: "{days} days ago",
             xMonthsAgo: "{months} month(s) ago",
             xYearsAgo: "{years} year(s) ago",
             xYearsAndMonthsAgo: "{years} year(s) and {months} month(s) ago",
+            xDaysAgoCompact: "{days} days",
+            xMonthsAgoCompact: "{months} month(s)",
+            xYearsAgoCompact: "{years} year(s)",
+            xYearsAndMonthsAgoCompact: "{years} year(s) and {months} month(s)",
           },
           event: {
             nameSingular: "Event",
@@ -222,10 +230,18 @@ export default defineI18nConfig(() => ({
             xMonthsNext: "Dans {months} mois",
             xYearsNext: "Dans {years} an(s)",
             xYearsAndMonthsNext: "Dans {years} an(s) et {months} mois",
+            xDaysNextCompact: "{days} jours",
+            xMonthsNextCompact: "{months} mois",
+            xYearsNextCompact: "{years} an(s)",
+            xYearsAndMonthsNextCompact: "{years} an(s) et {months} mois",
             xDaysAgo: "Il y a {days} jours",
             xMonthsAgo: "Il y a {months} mois",
             xYearsAgo: "Il y a {years} an(s)",
             xYearsAndMonthsAgo: "Il y a {years} an(s) et {months} mois",
+            xDaysAgoCompact: "{days} jours",
+            xMonthsAgoCompact: "{months} mois",
+            xYearsAgoCompact: "{years} an(s)",
+            xYearsAndMonthsAgoCompact: "{years} an(s) et {months} mois",
           },
           event: {
             nameSingular: "Évènement",
diff --git a/stores/CalendarStore.ts b/stores/CalendarStore.ts
index c575d1c..35acc89 100644
--- a/stores/CalendarStore.ts
+++ b/stores/CalendarStore.ts
@@ -496,12 +496,24 @@ export const useCalendar = defineStore("calendar", () => {
       years: "xYearsNext",
       yearsAndMonths: "xYearsAndMonthsNext",
     }
+    const futureKeysCompact: DateDirectionTranslationKeys = {
+      days: "xDaysNextCompact",
+      months: "xMonthsNextCompact",
+      years: "xYearsNextCompact",
+      yearsAndMonths: "xYearsAndMonthsNextCompact",
+    }
     const pastKeys: DateDirectionTranslationKeys = {
       days: "xDaysAgo",
       months: "xMonthsAgo",
       years: "xYearsAgo",
       yearsAndMonths: "xYearsAndMonthsAgo",
     }
+    const pastKeysCompact: DateDirectionTranslationKeys = {
+      days: "xDaysAgoCompact",
+      months: "xMonthsAgoCompact",
+      years: "xYearsAgoCompact",
+      yearsAndMonths: "xYearsAndMonthsAgoCompact",
+    }
     let directionKeys: DateDirectionTranslationKeys = pastKeys
 
     // Check whether it's a past or future date
@@ -535,6 +547,13 @@ export const useCalendar = defineStore("calendar", () => {
       } else {
         directionKeys = pastKeys
       }
+    } else {
+      // Get relevant prefix for the string (without the prefix)
+      if (direction === "future") {
+        directionKeys = futureKeysCompact
+      } else {
+        directionKeys = pastKeysCompact
+      }
     }
 
     const isSameMonth = baseDate.month === relativeDate.month