From 9390d97321188834a56bd592a3a0a41e9b8ba28a Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 5 Feb 2016 09:30:50 -0500
Subject: Stats for recently active and new users now shows date with the time

---
 web/react/components/admin_console/analytics.jsx | 27 ++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx
index 0a159d2e3..73ad86a8e 100644
--- a/web/react/components/admin_console/analytics.jsx
+++ b/web/react/components/admin_console/analytics.jsx
@@ -1,7 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import * as Utils from '../../utils/utils.jsx';
 import Constants from '../../utils/constants.jsx';
 import LineChart from './line_chart.jsx';
 import DoughnutChart from './doughnut_chart.jsx';
@@ -10,7 +9,7 @@ import StatisticCount from './statistic_count.jsx';
 var Tooltip = ReactBootstrap.Tooltip;
 var OverlayTrigger = ReactBootstrap.OverlayTrigger;
 
-import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl';
+import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedDate} from 'mm-intl';
 
 const holders = defineMessages({
     analyticsTotalUsers: {
@@ -322,7 +321,17 @@ export default class Analytics extends React.Component {
                                                     </time>
                                                 </OverlayTrigger>
                                             </td>
-                                            <td>{Utils.displayDateTime(user.last_activity_at)}</td>
+                                            <td>
+                                                <FormattedDate
+                                                    value={user.last_activity_at}
+                                                    day='numeric'
+                                                    month='long'
+                                                    year='numeric'
+                                                    hour12={true}
+                                                    hour='2-digit'
+                                                    minute='2-digit'
+                                                />
+                                            </td>
                                         </tr>
                                     );
                                 })
@@ -378,7 +387,17 @@ export default class Analytics extends React.Component {
                                                     </time>
                                                 </OverlayTrigger>
                                             </td>
-                                            <td>{Utils.displayDateTime(user.create_at)}</td>
+                                            <td>
+                                                <FormattedDate
+                                                    value={user.create_at}
+                                                    day='numeric'
+                                                    month='long'
+                                                    year='numeric'
+                                                    hour12={true}
+                                                    hour='2-digit'
+                                                    minute='2-digit'
+                                                />
+                                            </td>
                                         </tr>
                                     );
                                 })
-- 
cgit v1.2.3-1-g7c22