imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/rooms/RoomHeader.js
This commit is contained in:
Michael Telatynski 2017-07-03 19:15:38 +01:00
commit 34c9bbfd86
No known key found for this signature in database
GPG key ID: 0435A1D4BBD34D64
35 changed files with 2562 additions and 1287 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/DateUtils.js
View file

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