diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 14:31:43 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 14:31:43 -0700 |
| commit | c06a384ff8e1fd3b5d2eca12b6b9f9d48fe70004 (patch) | |
| tree | 252b69b00c98db4ad8c7fcc7683a0915ea18c2dc /web | |
| parent | 0b78b4465a445ae3d845e2d17a0c759bf5b237e4 (diff) | |
| download | chat-c06a384ff8e1fd3b5d2eca12b6b9f9d48fe70004.tar.gz chat-c06a384ff8e1fd3b5d2eca12b6b9f9d48fe70004.tar.bz2 chat-c06a384ff8e1fd3b5d2eca12b6b9f9d48fe70004.zip | |
Simplified hour conversion logic
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/user_settings.jsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index c336ae4b4..5e9504c2d 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -658,8 +658,7 @@ var SecurityTab = React.createClass({ ); } else { var d = new Date(this.props.user.last_password_update); - var hour = d.getHours() > 12 ? String(d.getHours() - 12) : String(d.getHours()); - hour = hour === "0" ? "12" : hour; + var hour = d.getHours() % 12 ? String(d.getHours() % 12) : "12"; var min = d.getMinutes() < 10 ? "0" + d.getMinutes() : String(d.getMinutes()); var timeOfDay = d.getHours() >= 12 ? " pm" : " am"; var dateStr = "Last updated " + Constants.MONTHS[d.getMonth()] + " " + d.getDate() + ", " + d.getFullYear() + " at " + hour + ":" + min + timeOfDay; |