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

Use 12h timestamps when enabled in RR

Browse source 
Fixes vector-im/riot-web#4393 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
turt2live 2017-06-22 08:53:58 -06:00
parent 042152aa66
commit a22f14e910
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/DateUtils.js
View file

@ -60,7 +60,7 @@ function twelveHourTime(date) {
}
module.exports = {
formatDate: function(date) {
formatDate: function(date, showTwelveHour=false) {
var now = new Date();
const days = getDaysArray();
const months = getMonthsArray();
@ -69,7 +69,7 @@ module.exports = {
}
else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
// TODO: use standard date localize function provided in counterpart
return _t('%(weekDayName)s %(time)s', {weekDayName: days[date.getDay()], time: this.formatTime(date)});
return _t('%(weekDayName)s %(time)s', {weekDayName: days[date.getDay()], time: this.formatTime(date, showTwelveHour)});
}
else if (now.getFullYear() === date.getFullYear()) {
// TODO: use standard date localize function provided in counterpart
@ -80,7 +80,7 @@ module.exports = {
time: this.formatTime(date),
});
}
return this.formatFullDate(date);
return this.formatFullDate(date, showTwelveHour);
},
formatFullDate: function(date, showTwelveHour=false) {