diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 14:22:25 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 14:22:25 -0700 |
commit | 0b78b4465a445ae3d845e2d17a0c759bf5b237e4 (patch) | |
tree | 639673ac5d8fbca3642529a9a636b9c00c969e7c /web/react/components | |
parent | 0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7 (diff) | |
download | chat-0b78b4465a445ae3d845e2d17a0c759bf5b237e4.tar.gz chat-0b78b4465a445ae3d845e2d17a0c759bf5b237e4.tar.bz2 chat-0b78b4465a445ae3d845e2d17a0c759bf5b237e4.zip |
Changed format of the time in the security tab to a 12hr clock from a 24hr clock
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/user_settings.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index a9c2433f2..c336ae4b4 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -658,9 +658,11 @@ 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) : String(d.getHours()); + hour = hour === "0" ? "12" : hour; 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 |