diff options
| author | Corey Hulen <corey@hulen.com> | 2015-06-25 10:58:31 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-06-25 10:58:31 -0400 |
| commit | b33ab3d3e1c259b6394bffdf80fe150c00fad8ec (patch) | |
| tree | e523a69866c269b0e58c8f9d94300fc697fa8345 /web/react | |
| parent | 5bc0a19953a4c66058da08e7d560a01b0d428607 (diff) | |
| parent | c06a384ff8e1fd3b5d2eca12b6b9f9d48fe70004 (diff) | |
| download | chat-b33ab3d3e1c259b6394bffdf80fe150c00fad8ec.tar.gz chat-b33ab3d3e1c259b6394bffdf80fe150c00fad8ec.tar.bz2 chat-b33ab3d3e1c259b6394bffdf80fe150c00fad8ec.zip | |
Merge pull request #8 from rgarmsen2295/mm-1097
MM-1097
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/user_settings.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index 110634b50..7d542a8b7 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -658,9 +658,10 @@ var SecurityTab = React.createClass({ ); } else { var d = new Date(this.props.user.last_password_update); - var hour = d.getHours() < 10 ? "0" + d.getHours() : String(d.getHours()); + var hour = d.getHours() % 12 ? String(d.getHours() % 12) : "12"; var min = d.getMinutes() < 10 ? "0" + d.getMinutes() : String(d.getMinutes()); - var dateStr = "Last updated " + Constants.MONTHS[d.getMonth()] + " " + d.getDate() + ", " + d.getFullYear() + " at " + hour + ":" + min; + var timeOfDay = d.getHours() >= 12 ? " pm" : " am"; + var dateStr = "Last updated " + Constants.MONTHS[d.getMonth()] + " " + d.getDate() + ", " + d.getFullYear() + " at " + hour + ":" + min + timeOfDay; passwordSection = ( <SettingItemMin |