Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Representation of episode start time when not starting at the full hour in am/pm notation

This commit is contained in:
Taloth Saldono 2020-02-01 22:47:34 +01:00
parent 010c65af9c
commit 268fc46ef7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/Utilities/Date/formatTime.js
View File

@ -5,15 +5,17 @@ function formatTime(date, timeFormat, { includeMinuteZero = false, includeSecond
return ''; return '';
} }
const time = moment(date);
if (includeSeconds) { if (includeSeconds) {
timeFormat = timeFormat.replace(/\(?:mm\)?/, ':mm:ss'); timeFormat = timeFormat.replace(/\(?:mm\)?/, ':mm:ss');
} else if (includeMinuteZero) { } else if (includeMinuteZero || time.minute() !== 0) {
timeFormat = timeFormat.replace('(:mm)', ':mm'); timeFormat = timeFormat.replace('(:mm)', ':mm');
} else { } else {
timeFormat = timeFormat.replace('(:mm)', ''); timeFormat = timeFormat.replace('(:mm)', '');
} }
return moment(date).format(timeFormat); return time.format(timeFormat);
} }
export default formatTime; export default formatTime;