From df3777bf92849d46e489451837675ee895b161de Mon Sep 17 00:00:00 2001 From: James Clarke Date: Thu, 6 Mar 2025 11:30:17 +0000 Subject: [PATCH 1/3] Fix --- apps/agenda/agenda.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js index 914ff0217..5bf0b0ff6 100644 --- a/apps/agenda/agenda.js +++ b/apps/agenda/agenda.js @@ -44,11 +44,12 @@ function formatDay(date) { return formattedDate; } const today = new Date(Date.now()); - if (date.getDay() == today.getDay() && date.getMonth() == today.getMonth()) + if (date.getDate() == today.getDate()) return /*LANG*/"Today "; else { - const tomorrow = new Date(Date.now() + 86400 * 1000); - if (date.getDay() == tomorrow.getDay() && date.getMonth() == tomorrow.getMonth()) { + const tomorrow = new Date(Date.now()); + tomorrow.setDate(today.getDate + 1); + if (date.getDate() == tomorrow.getDate()) { return /*LANG*/"Tomorrow "; } return formattedDate; From 04881a1bd628123cd86a599ff2e39f4d3a9b1399 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Thu, 6 Mar 2025 19:11:38 +0000 Subject: [PATCH 2/3] Tomorrow Showing Correctly --- apps/agenda/agenda.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js index 5bf0b0ff6..f8fffc643 100644 --- a/apps/agenda/agenda.js +++ b/apps/agenda/agenda.js @@ -47,8 +47,8 @@ function formatDay(date) { if (date.getDate() == today.getDate()) return /*LANG*/"Today "; else { - const tomorrow = new Date(Date.now()); - tomorrow.setDate(today.getDate + 1); + var tomorrow = new Date(); + tomorrow.setDate(tomorrow.getDate() + 1); if (date.getDate() == tomorrow.getDate()) { return /*LANG*/"Tomorrow "; } From 8bb397a137f3d5fb3fb4e2d06a2172565fe43c78 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Thu, 6 Mar 2025 19:27:40 +0000 Subject: [PATCH 3/3] Updated changelog and version no. --- apps/agenda/ChangeLog | 1 + apps/agenda/metadata.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog index cb60537e6..03ae7894b 100644 --- a/apps/agenda/ChangeLog +++ b/apps/agenda/ChangeLog @@ -16,3 +16,4 @@ 0.14: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones 0.15: Minor code improvements 0.16: Correct date for all day events in negative timezones, improve locale display +0.17: Fixed "Today" and "Tomorrow" labels displaying in non-current weeks diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json index c3e238567..c0198357d 100644 --- a/apps/agenda/metadata.json +++ b/apps/agenda/metadata.json @@ -1,7 +1,7 @@ { "id": "agenda", "name": "Agenda", - "version": "0.16", + "version": "0.17", "description": "Simple agenda", "icon": "agenda.png", "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],