From 0b78b4465a445ae3d845e2d17a0c759bf5b237e4 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Mon, 15 Jun 2015 14:22:25 -0700 Subject: Changed format of the time in the security tab to a 12hr clock from a 24hr clock --- web/react/components/user_settings.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'web/react') 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 = ( Date: Mon, 15 Jun 2015 14:31:43 -0700 Subject: Simplified hour conversion logic --- web/react/components/user_settings.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web/react') 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; -- cgit v1.2.3-1-g7c22