IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplified hour conversion logic

Browse Source
This commit is contained in:
Reed Garmsen
2015-06-15 14:31:43 -07:00
parent 0b78b4465a
commit c06a384ff8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/react/components/user_settings.jsx
View File

@@ -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;