mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2025-12-31 13:39:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): append time to formatted date when a custom date format is selected

Browse Source
This commit is contained in:
Pujit Mehrotra
2024-11-21 15:38:13 -05:00
parent 7c8e8a0e53
commit b9cd8c426d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/unraid-api/graph/resolvers/notifications/notifications.service.ts
View File

@@ -721,7 +721,14 @@ export class NotificationsService {
return timestamp;
}
this.logger.debug(`[formatTimestamp] ${settings.date} :: ${settings.time} :: ${date}`);
return strftime(settings.date, date);
let formatted = strftime(settings.date, date);
// %c represents System Time (i.e. the system's default date-time format).
// This seems to include time, so we shouldn't append time if %c is the format setting.
if (settings.date !== '%c') {
formatted += " " + strftime(settings.time ?? "%I:%M %p", date);
}
return formatted;
}
/**------------------------------------------------------------------------