fix: countdown time

Author: docimin

src/components/home/CountdownHeader.tsx

@@ -10,6 +10,7 @@ import { conId, conName, conTimeZone } from '@/configuration'
 import { useCache } from '@/context/data/Cache'
 import { EventDayRecord } from '@/context/data/types.api'
 import { useNow } from '@/hooks/time/useNow'
+import { dateFnsLocales } from '@/i18n'
 import { parseDefaultISO } from '@/util/parseDefaultISO'
 
 import { Image } from '../generic/atoms/Image'
@@ -36,7 +37,7 @@ const isSameDayInTimezone = (date1: Date, date2: string, timezone: string) => {
 /**
  * Calculates the countdown title based on current time and event days.
  */
-const useCountdownTitle = (t: TFunction, now: Date) => {
+const useCountdownTitle = (t: TFunction, now: Date, currentLanguage: string) => {
   const { eventDays } = useCache()
   const firstDay = eventDays[0]
   const lastDay = eventDays[eventDays.length - 1]
@@ -49,7 +50,8 @@ const useCountdownTitle = (t: TFunction, now: Date) => {
   if (firstDay) {
     const firstDate = new Date(firstDay.Date)
     if (now < firstDate) {
-      const diff = formatDistance(firstDate, now)
+      const locale = dateFnsLocales[currentLanguage as keyof typeof dateFnsLocales] || dateFnsLocales.en
+      const diff = formatDistance(firstDate, now, { locale, addSuffix: true })
       return t('before_event', { conName, diff })
     }
   }
@@ -66,13 +68,13 @@ const useCountdownTitle = (t: TFunction, now: Date) => {
 }
 
 export const CountdownHeader: FC<CountdownHeaderProps> = ({ style }) => {
-  const { t } = useTranslation('Countdown')
+  const { t, i18n } = useTranslation('Countdown')
   const { t: tAccessibility } = useTranslation('Home', { keyPrefix: 'accessibility' })
   const isFocused = useIsFocused()
   const now = useNow(isFocused ? 60 : 'static') // Convert to Date
 
   const { width } = useWindowDimensions()
-  const subtitle = useCountdownTitle(t, now)
+  const subtitle = useCountdownTitle(t, now, i18n.language)
 
   return (
     <View style={[styles.container, style]} role="banner" accessibilityLabel={tAccessibility('countdown_header')} accessibilityHint={tAccessibility('countdown_header_hint')}>

src/i18n/index.ts

@@ -31,7 +31,7 @@ export type Translation = (typeof supportedTranslations)[number]
 /**
  * Map language codes to date-fns locales.
  */
-const dateFnsLocales: Record<string, Locale> = {
+export const dateFnsLocales: Record<string, Locale> = {
   en: enGB,
   nl: nl,
   pl: pl,

src/i18n/translations.de.json

@@ -267,7 +267,7 @@
   },
   "Countdown": {
     "after_event": "Das war's! Wir hoffen wir sehen Dich nächstes Jahr wieder!",
-    "before_event": "{{conName}} beginnt in {{diff}}(n)"
+    "before_event": "{{conName}} beginnt {{diff}}"
   },
   "Dealer": {
     "about": "Infos",

src/i18n/translations.en.json

@@ -268,7 +268,7 @@
   },
   "Countdown": {
     "after_event": "That was it! We hope to see you again next year!",
-    "before_event": "{{conName}} will start in {{diff}}"
+    "before_event": "{{conName}} will start {{diff}}"
   },
   "Dealer": {
     "about": "About",

src/i18n/translations.nl.json

@@ -191,7 +191,7 @@
   },
   "Countdown": {
     "after_event": "En dat was het weer! Tot volgend jaar!",
-    "before_event": "{{conName}} begint over {{diff}}"
+    "before_event": "{{conName}} begint {{diff}}"
   },
   "Dealer": {
     "accessibility": {

src/i18n/translations.pl.json

@@ -150,7 +150,7 @@
   },
   "Countdown": {
     "after_event": "I to na tyle! Do zobaczenia w przyszłym roku!",
-    "before_event": "{{conName}} zacznie się za {{diff}}"
+    "before_event": "{{conName}} zacznie się {{diff}}"
   },
   "Dealer": {
     "about": "Podsumowanie",