toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix Android timestamp when timezone is not enabled (#1982)

Browse source 
* Fix Android timestamp when timezone is not enabled

* Remove unnecesary comments
This commit is contained in:
Elias Nahum 2018-08-08 14:24:26 -04:00 committed by GitHub
parent c7807d910a
commit dabc24892f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/components/formatted_time.js
View file

@ -18,22 +18,41 @@ export default class FormattedTime extends React.PureComponent {
intl: intlShape.isRequired,
};
render() {
getFormattedTime = () => {
const {intl} = this.context;
const {
value,
children,
timeZone,
hour12,
} = this.props;
const {intl} = this.context;
const timezoneProps = timeZone ? {timeZone} : {};
const formattedTime = intl.formatDate(value, {
...timezoneProps,
hour: 'numeric',
minute: 'numeric',
hour12,
});
if (timeZone) {
return intl.formatDate(value, {
timeZone,
hour: 'numeric',
minute: 'numeric',
hour12,
});
}
// If no timezone is defined fallback to the previous implementation
const date = new Date(value);
const militaryTime = !hour12;
const hour = militaryTime ? date.getHours() : (date.getHours() % 12 || 12);
let minute = date.getMinutes();
minute = minute >= 10 ? minute : ('0' + minute);
let time = '';
if (!militaryTime) {
time = (date.getHours() >= 12 ? ' PM' : ' AM');
}
return hour + ':' + minute + time;
};
render() {
const {children} = this.props;
const formattedTime = this.getFormattedTime();
if (typeof children === 'function') {
return children(formattedTime);