Merge remote-tracking branch 'origin/dev' into master_latest

remotes/origin/hasaccess^2
nikita 8 years ago
commit 6ef802f463
  1. 3
      apps/school/models.py

@ -1,6 +1,7 @@
import arrow
from datetime import datetime, timedelta
from django.conf import settings
from django.db import models
from django.urls import reverse_lazy
from django.utils.timezone import now
@ -69,7 +70,7 @@ class SchoolSchedule(models.Model):
@property
def start_at_humanize(self):
return arrow.get(datetime.combine(datetime.today(), self.start_at)).humanize(locale='ru') if self.start_at else None
return arrow.get(datetime.combine(datetime.today(), self.start_at), settings.TIME_ZONE).humanize(locale='ru') if self.start_at else None
class SchoolScheduleImage(models.Model):

Loading…
Cancel
Save