From a8a5db401fb10080cdc63fa48e4721798d328cae Mon Sep 17 00:00:00 2001
From: mkieledunsche <83220538+mkieledunsche@users.noreply.github.com>
Date: Fri, 6 Jun 2025 15:09:56 +0200
Subject: [PATCH 1/2] Improved timer finish time display in Timer.vue: adding
 "+Xd" suffix to hh:mm for future days

as discussed in  #382
---
 vue3/src/components/display/Timer.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/vue3/src/components/display/Timer.vue b/vue3/src/components/display/Timer.vue
index 491887ea6..812873dfe 100644
--- a/vue3/src/components/display/Timer.vue
+++ b/vue3/src/components/display/Timer.vue
@@ -2,7 +2,7 @@
     <v-progress-linear :model-value="timerProgress" color="primary" height="5"></v-progress-linear>
     <v-alert :color="timerColor" class="rounded-0" variant="tonal">
         <v-alert-title><i class="fas fa-stopwatch mr-1"></i> {{ Duration.fromMillis(durationSeconds * 1000).toFormat('hh:mm:ss') }}</v-alert-title>
-        {{$t('FinishedAt')}} {{ DateTime.now().plus({'seconds': durationSeconds}).toLocaleString(DateTime.TIME_SIMPLE) }}
+        {{$t('FinishedAt')}} {{ formatFinishTime(durationSeconds) }}
         <template #close>
             <v-btn-group divided>
                 <v-btn width="40" @click="changeTimer(-60)"><i class="fas fa-minus"></i>1</v-btn>
@@ -76,8 +76,25 @@ function stopTimer() {
     emit('stop')
 }
 
+/**
+* formats a future time based on a duration in seconds from now
+* displays the time in "hh:mm" format and adds a "+Xd" suffix if the target day differs from today
+*/
+function formatFinishTime(durationSeconds: number): string {
+    const now = DateTime.now()
+    const target = now.plus({ seconds: durationSeconds })
+    let timeString = target.toLocaleString(DateTime.TIME_SIMPLE)
+    const daysDifference = Math.floor(
+        target.startOf('day').diff(now.startOf('day'), 'days').days
+    )
+    if (daysDifference >= 1) {
+        timeString += ` +${daysDifference}d`
+    }
+    return timeString
+}
+
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>

From 68040aa5686b1e35bae26b20625e27d60f8141fd Mon Sep 17 00:00:00 2001
From: mkieledunsche <83220538+mkieledunsche@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:31:27 +0200
Subject: [PATCH 2/2] added localization for "+Xd" suffix in Timer.vue

---
 vue3/src/components/display/Timer.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vue3/src/components/display/Timer.vue b/vue3/src/components/display/Timer.vue
index 812873dfe..9b53c472f 100644
--- a/vue3/src/components/display/Timer.vue
+++ b/vue3/src/components/display/Timer.vue
@@ -88,7 +88,8 @@ function formatFinishTime(durationSeconds: number): string {
         target.startOf('day').diff(now.startOf('day'), 'days').days
     )
     if (daysDifference >= 1) {
-        timeString += ` +${daysDifference}d`
+        const label = daysDifference === 1 ? t('Day') : t('Days');
+        timeString += ` +${daysDifference} ${label}`;
     }
     return timeString
 }