Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event-popover: Fix popover for all-day multi-day events

Browse Source 
All-day multi-day events go, e.g. from 01/01/2022 00:00 to 01/03/2022.
The old logic would have shown January 1 - January 3. This, however, is
incorrect and should instead be January 1 - January 2. As a result,
subtract one day from the end date when in the all-day multi-day case.
This commit is contained in:
Björn Daase
2022-03-07 18:29:44 +00:00
committed by Georges Basile Stavracas Neto
parent bde989cc0e
commit c9fa9253c1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gcal-event-popover.c
+8 -1
View File
@@ -379,10 +379,17 @@ update_date_time_label (GcalEventPopover *self)
g_autofree gchar *start_str = NULL; g_autofree gchar *start_str = NULL;
g_autofree gchar *end_str = NULL; g_autofree gchar *end_str = NULL;
gboolean show_year; gboolean show_year;
g_autoptr (GDateTime) real_end_dt = NULL;
show_year = g_date_time_get_year (start_dt) != g_date_time_get_year (end_dt); show_year = g_date_time_get_year (start_dt) != g_date_time_get_year (end_dt);
start_str = format_multiday_date (self, start_dt, show_year, show_hours); start_str = format_multiday_date (self, start_dt, show_year, show_hours);
end_str = format_multiday_date (self, end_dt, show_year, show_hours);
if (!show_hours)
real_end_dt = g_date_time_add_days (end_dt, -1);
else
real_end_dt = g_date_time_ref (end_dt);
end_str = format_multiday_date (self, real_end_dt, show_year, show_hours);
/* Translators: %1$s is the start date, and %2$s. For example: June 21 - November 29, 2022 */ /* Translators: %1$s is the start date, and %2$s. For example: June 21 - November 29, 2022 */
g_string_printf (string, _("%1$s — %2$s"), start_str, end_str); g_string_printf (string, _("%1$s — %2$s"), start_str, end_str);