Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #939 from turt2live/patch-1

Browse Source 
Fix PM being AM
This commit is contained in:
Michael Telatynski 2017-05-26 21:05:46 +01:00 committed by GitHub
commit db3d455a1d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DateUtils.js
View File

@ -54,7 +54,7 @@ function pad(n) {
function twelveHourTime(date) { function twelveHourTime(date) {
let hours = date.getHours() % 12; let hours = date.getHours() % 12;
const minutes = pad(date.getMinutes()); const minutes = pad(date.getMinutes());
const ampm = hours >= 12 ? 'PM' : 'AM'; const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
hours = pad(hours ? hours : 12); hours = pad(hours ? hours : 12);
return `${hours}:${minutes} ${ampm}`; return `${hours}:${minutes} ${ampm}`;
} }