Skip to content

[calendar] Show repeatingCountTitle only if yearDiff > 0 #3949

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
KristjanESPERANTO merged 2 commits into from
Nov 8, 2025
Merged

[calendar] Show repeatingCountTitle only if yearDiff > 0 #3949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
319f3d9
Show repeatingCountTitle only if yearDiff > 0
jarnoml Nov 5, 2025
3e58acd
changelog for #3949
jarnoml Nov 6, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ planned for 2026-01-01
- [tests] migrate from `jest` to `vitest` (#3940, #3941)
- [ci] Add concurrency to automated tests workflow to cancel outdated runs (#3943)
- [tests] replace `node-libgpiod` with `serialport` in electron-rebuild workflow (#3945)
- [calendar] hide repeatingCountTitle if the event count is zero (#3949)

### Fixed

Expand Down
4 changes: 3 additions & 1 deletion modules/default/calendar/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,9 @@ Module.register("calendar", {
const thisYear = eventStartDateMoment.year(),
yearDiff = thisYear - event.firstYear;

repeatingCountTitle = `, ${yearDiff} ${repeatingCountTitle}`;
if (yearDiff > 0) {
repeatingCountTitle = `, ${yearDiff} ${repeatingCountTitle}`;
}
}
}

Expand Down