From afdd198fb477f27f06718ed82b16aa349e973622 Mon Sep 17 00:00:00 2001
From: Urban Suppiger <urban@suppiger.net>
Date: Tue, 24 Jun 2025 21:52:13 +0200
Subject: [PATCH] fix dayjs locales

---
 common/helpers/dayjs.js                               |  1 +
 common/locales/en.json                                |  4 ++--
 .../components/print/print-client/renderPdf.worker.js |  7 ++++++-
 frontend/src/plugins/store/lang.js                    |  5 ++++-
 print/pages/index.vue                                 | 11 ++++++++++-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/common/helpers/dayjs.js b/common/helpers/dayjs.js
index 4b2c81b075..01b9096c38 100644
--- a/common/helpers/dayjs.js
+++ b/common/helpers/dayjs.js
@@ -35,6 +35,7 @@ export const dayjsLocaleMap = {
   en: 'en-gb',
   it: 'it-ch',
   fr: 'fr-ch',
+  rm: 'de-ch',
 }
 
 /**
diff --git a/common/locales/en.json b/common/locales/en.json
index e3d5709ef2..69bf6d9c0b 100644
--- a/common/locales/en.json
+++ b/common/locales/en.json
@@ -245,7 +245,7 @@
   "global": {
     "datetime": {
       "dateLong": "dd L",
-      "dateShort": "dd M/D",
+      "dateShort": "dd D/M",
       "dateTimeLong": "dd L LT",
       "duration": {
         "daysAndHours": "{days} d {hours} h",
@@ -295,4 +295,4 @@
       "title": "Table of contents"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/components/print/print-client/renderPdf.worker.js b/frontend/src/components/print/print-client/renderPdf.worker.js
index 81b11f3df7..b6e960c560 100644
--- a/frontend/src/components/print/print-client/renderPdf.worker.js
+++ b/frontend/src/components/print/print-client/renderPdf.worker.js
@@ -26,7 +26,12 @@ export const renderPdfInWorker = async (data) => {
 
   // We need to set the locale again here. Otherwise dayjs falls back to the default
   // on production deployments
-  dayjs.locale(Object.keys(dayjsLocaleMap).includes(lang) ? dayjsLocaleMap[lang] : lang)
+  const twoLetterLocale = lang.substring(0, 2)
+  dayjs.locale(
+    Object.keys(dayjsLocaleMap).includes(twoLetterLocale)
+      ? dayjsLocaleMap[twoLetterLocale]
+      : lang
+  )
 
   const result = { ...(await renderPdf(data)) }
   if (result.error) {
diff --git a/frontend/src/plugins/store/lang.js b/frontend/src/plugins/store/lang.js
index c7f8a5cde8..5acb33e3db 100644
--- a/frontend/src/plugins/store/lang.js
+++ b/frontend/src/plugins/store/lang.js
@@ -23,8 +23,11 @@ export const mutations = {
 
     state.language = lang
     VueI18n.locale = lang
+    const twoLetterLocale = lang.substring(0, 2)
     Vue.dayjs.locale(
-      Object.keys(dayjsLocaleMap).includes(lang) ? dayjsLocaleMap[lang] : lang
+      Object.keys(dayjsLocaleMap).includes(twoLetterLocale)
+        ? dayjsLocaleMap[twoLetterLocale]
+        : lang
     )
     localeChanged()
     axios.defaults.headers.common['Accept-Language'] = lang
diff --git a/print/pages/index.vue b/print/pages/index.vue
index e9f82068d3..189a777936 100644
--- a/print/pages/index.vue
+++ b/print/pages/index.vue
@@ -16,6 +16,8 @@
 </template>
 
 <script setup>
+import { dayjsLocaleMap } from '@/common/helpers/dayjs.js'
+
 // parse query config
 const route = useRoute()
 const query = route.query
@@ -26,7 +28,14 @@ const { setLocale, fallbackLocale } = useI18n()
 const { $date } = useNuxtApp()
 const locale = config.language || fallbackLocale.value
 await setLocale(locale) // i18n
-$date.locale(locale) //dayjs
+
+//dayjs
+const twoLetterLocale = locale.substring(0, 2)
+$date.locale(
+  Object.keys(dayjsLocaleMap).includes(twoLetterLocale)
+    ? dayjsLocaleMap[twoLetterLocale]
+    : locale
+)
 
 // load camp
 const { $api } = useNuxtApp()