Skip to content

Fix timezone for results dates in contest rules #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
otargowski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix timezone for results dates in contest rules #781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions oioioi/contests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from django.db.models import OuterRef, Q, Subquery
from django.http import HttpRequest
from django.shortcuts import get_object_or_404
from django.utils import formats, timezone
from django.utils.module_loading import import_string
from django.utils.translation import gettext_lazy as _
from pytz import UTC
Expand Down Expand Up @@ -369,12 +370,12 @@ def get_results_visibility(request):
if results_date is None or results_date <= request.timestamp:
results = _("immediately")
else:
results = _("after %(date)s") % {"date": results_date.strftime("%Y-%m-%d %H:%M:%S")}
results = _("after %(date)s") % {"date": formats.localize(timezone.localtime(results_date))}

if public_results_date is None or public_results_date <= request.timestamp:
ranking = _("immediately")
else:
ranking = _("after %(date)s") % {"date": public_results_date.strftime("%Y-%m-%d %H:%M:%S")}
results = _("after %(date)s") % {"date": formats.localize(timezone.localtime(public_results_date))}

dates.append({"name": r.name, "results": results, "ranking": ranking})

Expand Down
Loading