From c1c354ccaea4628e49f5fa8a8394a9528406d951 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 28 2015 10:32:46 +0000 Subject: Harmonize globally the way we present dates --- diff --git a/pagure/api/issue.py b/pagure/api/issue.py index 9dd67e7..269a69d 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -452,7 +452,7 @@ def api_view_issue_comment(repo, issueid, commentid, username=None): output = comment.to_json(public=True) output['avatar_url'] = pagure.lib.avatar_url(comment.user.user, size=16) - output['comment_date'] = comment.date_created.strftime('%Y-%m-%d %H:%M') + output['comment_date'] = comment.date_created.strftime('%Y-%m-%d %H:%M:%S') jsonout = flask.jsonify(output) return jsonout diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index ab88c86..3a3696b 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -245,7 +245,7 @@ def add_issue_comment(session, issue, comment, user, ticketfolder, 'comment_user': issue_comment.user.user, 'avatar_url': avatar_url(issue_comment.user.user, size=16), 'comment_date': issue_comment.date_created.strftime( - '%Y-%m-%d %H:%M'), + '%Y-%m-%d %H:%M:%S'), })) return 'Comment added' @@ -818,7 +818,7 @@ def add_pull_request_comment(session, request, commit, filename, row, 'comment_user': pr_comment.user.user, 'comment_id': pr_comment.id, 'avatar_url': avatar_url(pr_comment.user.user, size=16), - 'comment_date': pr_comment.date_created.strftime('%Y-%m-%d %H:%M'), + 'comment_date': pr_comment.date_created.strftime('%Y-%m-%d %H:%M:%S'), 'commit_id': commit, 'filename': filename, 'line': row, diff --git a/pagure/templates/forks.html b/pagure/templates/forks.html index f60796e..70b1885 100644 --- a/pagure/templates/forks.html +++ b/pagure/templates/forks.html @@ -17,7 +17,8 @@
{{ fork.user.user }}/{{ fork.name }}
- + Forked {{ fork.date_created|humanize }}
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index 5c3689a..1f74745 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -106,7 +106,7 @@ - {{ issue.date_created.strftime('%Y-%m-%d %H:%M') }} + {{ issue.date_created.strftime('%Y-%m-%d %H:%M:%S') }} {% if issue.assignee %} diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html index 4162be3..2df8507 100644 --- a/pagure/templates/requests.html +++ b/pagure/templates/requests.html @@ -69,7 +69,7 @@ - {{ request.date_created.strftime('%Y-%m-%d %H:%M') }} + {{ request.date_created.strftime('%Y-%m-%d %H:%M:%S') }} {% if request.assignee %} diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html index 93e6cdc..d08d182 100644 --- a/pagure/templates/user_requests.html +++ b/pagure/templates/user_requests.html @@ -54,7 +54,7 @@ {{ request.user.user }} - {{ request.date_created.strftime('%Y-%m-%d %H:%M') }} + {{ request.date_created.strftime('%Y-%m-%d %H:%M:%S') }} {% if request.assignee %}