Upgrade to Django 3.2
This commit is contained in:
parent
c1f710c9ac
commit
409d2e3115
23 changed files with 1469 additions and 151 deletions
|
@ -1,5 +1,4 @@
|
|||
from django.conf import settings
|
||||
from django.utils import six
|
||||
from django.utils.safestring import SafeData, mark_safe
|
||||
|
||||
if settings.USE_I18N:
|
||||
|
@ -27,7 +26,7 @@ if settings.USE_I18N:
|
|||
else:
|
||||
translation_object = translation(get_language())
|
||||
result = getattr(translation_object, translation_function)(eol_message)
|
||||
if not isinstance(result, six.text_type):
|
||||
if not isinstance(result, str):
|
||||
result = result.decode("utf-8")
|
||||
|
||||
if isinstance(message, SafeData):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue