diff --git a/src/components/tasks/partials/reminder-period.vue b/src/components/tasks/partials/reminder-period.vue index ee420e139..391f9b923 100644 --- a/src/components/tasks/partials/reminder-period.vue +++ b/src/components/tasks/partials/reminder-period.vue @@ -14,7 +14,7 @@ v-model="periodInput.duration.days" type="number" min="0" - /> {{ $t('task.reminder.daysShort') }} + /> {{ $t('task.reminder.days') }} 0 ? duration.days + ' d ' : '') + + return (duration.days > 0 ? `${duration.days} ${t('task.reminder.days')} `: '') + ('' + duration.hours).padStart(2, '0') + ':' + ('' + duration.minutes).padStart(2, '0') } diff --git a/src/helpers/time/period.ts b/src/helpers/time/period.ts index 6d3a04ee9..a8e2b6eeb 100644 --- a/src/helpers/time/period.ts +++ b/src/helpers/time/period.ts @@ -3,12 +3,13 @@ import {SECONDS_A_DAY, SECONDS_A_HOUR, SECONDS_A_MINUTE} from '@/constants/date' /** * Convert time period given as seconds to days, hour, minutes, seconds */ -export function secondsToPeriod(seconds: number): {days: number, hours: number, minutes: number, seconds: number} { - const d = Math.floor(seconds / SECONDS_A_DAY) - const h = Math.floor(seconds % SECONDS_A_DAY / 3600) - const m = Math.floor(seconds % SECONDS_A_HOUR / 60) - const s = Math.floor(seconds % 60) - return {days: d, hours: h, minutes: m, seconds: s} +export function secondsToPeriod(seconds: number): {days: number, hours: number, minutes: number, seconds: number} { + return { + days: Math.floor(seconds / SECONDS_A_DAY), + hours: Math.floor(seconds % SECONDS_A_DAY / 3600), + minutes: Math.floor(seconds % SECONDS_A_HOUR / 60), + seconds: Math.floor(seconds % 60), + } } /** diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index 2d92bb31d..ca7f394f9 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -723,7 +723,8 @@ "reminder": { "hoursShort": "HH", "minutesShort": "MM", - "daysShort": "d" + "daysShort": "d", + "days": "days" }, "repeat": { "everyDay": "Every Day",