This commit is contained in:
Alexandr Artemyev 2020-05-25 17:46:08 +03:00
parent 731514c52f
commit 96bd3e1047
No known key found for this signature in database
GPG key ID: A933AC7E1FC84C2D

View file

@ -19,6 +19,7 @@ from django.utils import timezone
from django.utils.encoding import smart_bytes
from django.utils.formats import localize
from django.utils.module_loading import import_string
from django.utils.text import normalize_newlines
from django.utils.translation import ugettext_lazy as _
from . import LazyConfig, settings
@ -146,6 +147,9 @@ class ConstanceForm(forms.Form):
current = getattr(config, name)
new = self.cleaned_data[name]
if isinstance(new, str):
new = normalize_newlines(new)
if conf.settings.USE_TZ and isinstance(current, datetime) and not timezone.is_aware(current):
current = timezone.make_aware(current)