From a813d09ae57117ffeef0c7be67c9fb2ef7c8af9f Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 30 Nov 2023 13:26:14 -0700
Subject: [PATCH] Calendar: Fix multi-day date format in tooltip, place end
 date on second line

---
 calendar/js/et2_widget_event.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts
index 12c4260ad0..383135b4d2 100644
--- a/calendar/js/et2_widget_event.ts
+++ b/calendar/js/et2_widget_event.ts
@@ -25,7 +25,7 @@ import {egw_getAppObjectManager, egwActionObject} from '../../api/js/egw_action/
 import {egw} from "../../api/js/jsapi/egw_global";
 import {et2_container} from "../../api/js/etemplate/et2_core_baseWidget";
 import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
-import {formatDate, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date";
+import {formatDate, formatDateTime, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date";
 import {ColorTranslator} from "colortranslator";
 import {StaticOptions as so} from "../../api/js/etemplate/Et2Select/StaticOptions";
 import {Et2Select} from "../../api/js/etemplate/Et2Select/Et2Select";
@@ -519,8 +519,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 
 			const times = !this.options.value.multiday ?
 						  '<span class="calendar_calEventLabel">' + this.egw().lang('Time') + '</span>: ' + timespan :
-						  '<span class="calendar_calEventLabel">' + this.egw().lang('Start') + '</span>: ' + start + ' ' +
-							  '<span class="calendar_calEventLabel">' + this.egw().lang('End') + '</span>: ' + end;
+						  '<span class="calendar_calEventLabel">' + this.egw().lang('Start') + '</span>:&nbsp;' + formatDateTime(start).replace(' ', '&nbsp;') + ' ' +
+							  '<span class="calendar_calEventLabel">' + this.egw().lang('End') + '</span>:&nbsp;' + formatDateTime(end).replace(' ', '&nbsp;');
 			let cat_label : (string | string[]) = '';
 			if(this.options.value.category)
 			{