OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor DateSep, use new Dateutils.formatFullDateNoTime 

as it is not desired for it to include the time.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/5984/head
Michael Telatynski 2018-01-14 18:33:58 +00:00
parent d3811e3287
commit 22c024cc94
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/components/views/messages/DateSeparator.js
View File

@ -1,5 +1,6 @@
/* /*
Copyright 2015, 2016 OpenMarket Ltd Copyright 2015, 2016 OpenMarket Ltd
Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -15,8 +16,9 @@ limitations under the License.
*/ */
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';
import {formatFullDate} from 'matrix-react-sdk/lib/DateUtils'; import {formatFullDateNoTime} from 'matrix-react-sdk/lib/DateUtils';
function getdaysArray() { function getdaysArray() {
return [ return [
@ -30,30 +32,30 @@ function getdaysArray() {
]; ];
} }
module.exports = React.createClass({ export class DateSeparator extends React.Component {
displayName: 'DateSeparator', static propTypes = {
render: function() { ts: PropTypes.number.isRequired,
var date = new Date(this.props.ts); };
var today = new Date();
var yesterday = new Date(); getLabel() {
var days = getdaysArray(); const date = new Date(this.props.ts);
const today = new Date();
const yesterday = new Date();
const days = getdaysArray();
yesterday.setDate(today.getDate() - 1); yesterday.setDate(today.getDate() - 1);
var label;
if (date.toDateString() === today.toDateString()) { if (date.toDateString() === today.toDateString()) {
label = _t('Today'); return _t('Today');
} else if (date.toDateString() === yesterday.toDateString()) {
return _t('Yesterday');
} else if (today.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
return days[date.getDay()];
} else {
return formatFullDateNoTime(date);
} }
else if (date.toDateString() === yesterday.toDateString()) {
label = _t('Yesterday');
}
else if (today.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
label = days[date.getDay()];
}
else {
label = formatFullDate(date, this.props.showTwelveHour);
} }
return ( render() {
<h2 className="mx_DateSeparator">{ label }</h2> return <h2 className="mx_DateSeparator">{ this.getLabel() }</h2>;
); }
} }
});