Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[stable4.7] fix: always show alarm unit in pural #6756

Merged
merged 1 commit into from
Feb 20, 2025
Merged

[stable4.7] fix: always show alarm unit in pural #6756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/components/Editor/Alarm/AlarmTimeUnitSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,28 +71,28 @@

if (this.unit === 'seconds') {
options.push({
label: this.$n('calendar', 'second', 'seconds', this.count),
label: this.$t('calendar', 'seconds'),
unit: 'seconds',
})
}

if (!this.isAllDay || ['minutes', 'hours'].indexOf(this.unit) !== -1) {
options.push({
label: this.$n('calendar', 'minute', 'minutes', this.count),
label: this.$t('calendar', 'minutes'),

Check warning on line 81 in src/components/Editor/Alarm/AlarmTimeUnitSelect.vue

View check run for this annotation

Codecov / codecov/patch

src/components/Editor/Alarm/AlarmTimeUnitSelect.vue#L81 

Added line #L81 was not covered by tests
unit: 'minutes',
})
options.push({
label: this.$n('calendar', 'hour', 'hours', this.count),
label: this.$t('calendar', 'hours'),

Check warning on line 85 in src/components/Editor/Alarm/AlarmTimeUnitSelect.vue

View check run for this annotation

Codecov / codecov/patch

src/components/Editor/Alarm/AlarmTimeUnitSelect.vue#L85 

Added line #L85 was not covered by tests
unit: 'hours',
})
}

options.push({
label: this.$n('calendar', 'day', 'days', this.count),
label: this.$t('calendar', 'days'),
unit: 'days',
})
options.push({
label: this.$n('calendar', 'week', 'weeks', this.count),
label: this.$t('calendar', 'weeks'),
unit: 'weeks',
})

Expand Down
Loading