Skip to content
Snippets Groups Projects
Commit 10c10092 authored by Konrad Mohrfeldt's avatar Konrad Mohrfeldt :koala:
Browse files

fix: don’t expect schedule.lastDate to be set

refs #239
parent 7bf884b3
No related branches found
No related tags found
No related merge requests found
Pipeline #7404 failed
......@@ -51,12 +51,19 @@
</p>
</div>
<div v-else-if="scheduleRRule">
<p
v-html="
$t('scheduleEditor.recurringSchedule', {
rrule: scheduleRRule.name,
lastDate: prettyDate(schedule.lastDate),
})
<SafeHTML
as="p"
sanitize-preset="safe-html"
:html="
$t(
schedule.lastDate
? 'scheduleEditor.recurringSchedule'
: 'scheduleEditor.recurringScheduleNoEnd',
{
rrule: scheduleRRule.name,
lastDate: schedule.lastDate ? prettyDate(schedule.lastDate) : '',
},
)
"
/>
......@@ -209,9 +216,10 @@ import prettyDate, { formatSeconds, hmsToSeconds } from '../../mixins/prettyDate
import ServerErrors from '@/components/ServerErrors.vue'
import { sanitizeHTML } from '@/util'
import { useRRuleStore } from '@/stores/rrules'
import SafeHTML from '@/components/generic/SafeHTML.js'
export default {
components: { ServerErrors },
components: { SafeHTML, ServerErrors },
mixins: [prettyDate],
emits: ['conflict', 'update'],
......
......@@ -618,6 +618,7 @@ export default {
timeslotRuns:
'Dieser Sendeplatz läuft am <b>%{firstDate}</b> von <b>%{startTime}</b> bis <b>%{endTime}</b>',
recurringSchedule: 'Dieses Programm wiederholt sich <b>%{rrule}</b> bis <b>%{lastDate}</b>',
recurringScheduleNoEnd: 'Dieses Programm wiederholt sich <b>%{rrule}</b>.',
singleEmission: 'Der Sendeplatz ist eine einmalige Ausstrahlung',
coexistingTimeslot:
......
......@@ -577,6 +577,7 @@ export default {
newSchedule: 'from <b>%{firstDate}, %{startTime}</b> to <b>%{endTime}</b>',
recurringSchedule: 'This schedule repeats <b>%{rrule}</b> until <b>%{lastDate}</b>',
recurringScheduleNoEnd: 'This schedule repeats <b>%{rrule}</b>.',
leftToResolve:
'%{smart_count} conflicts left to resolve |||| %{smart_count} conflict left to resolve',
noneLeftToResolve: 'No more conflicts to resolve!',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment