Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dashboard
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
dashboard
Commits
10c10092
Commit
10c10092
authored
1 year ago
by
Konrad Mohrfeldt
Browse files
Options
Downloads
Patches
Plain Diff
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
1 year ago
Stage: test
Stage: release
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/emissions/ModalEdit.vue
+15
-7
15 additions, 7 deletions
src/components/emissions/ModalEdit.vue
src/i18n/de.js
+1
-0
1 addition, 0 deletions
src/i18n/de.js
src/i18n/en.js
+1
-0
1 addition, 0 deletions
src/i18n/en.js
with
17 additions
and
7 deletions
src/components/emissions/ModalEdit.vue
+
15
−
7
View file @
10c10092
...
...
@@ -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
'
],
...
...
This diff is collapsed.
Click to expand it.
src/i18n/de.js
+
1
−
0
View file @
10c10092
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
src/i18n/en.js
+
1
−
0
View file @
10c10092
...
...
@@ -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!
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment