Browse Source

Django 2 compatibility.

master
Erik Stein 7 years ago
parent
commit
cd2456ec15
  1. 4
      CHANGES
  2. 6
      shared/multilingual/utils/fields.py

4
CHANGES

@ -1,3 +1,5 @@
0.2.3 2018-10-07
- Django 2 compatibility
0.2.2 2018-10-05 0.2.2 2018-10-05
- Admin language switcher for popups - Admin language switcher for popups

6
shared/multilingual/utils/fields.py

@ -5,7 +5,7 @@ from django import forms
from django.conf import settings from django.conf import settings
from django.contrib.postgres.fields import JSONField from django.contrib.postgres.fields import JSONField
from django.db import models from django.db import models
from django.utils.translation import string_concat from django.utils.text import format_lazy
from shared.utils.translation import get_language, lang_suffix from shared.utils.translation import get_language, lang_suffix
@ -73,7 +73,7 @@ class TranslatableFieldMixin:
'name': self.name, 'name': self.name,
'null': False, # intentionally ignored 'null': False, # intentionally ignored
'primary_key': self.primary_key, 'primary_key': self.primary_key,
'rel': self.rel, 'rel': self.remote_field,
'serialize': self.serialize, 'serialize': self.serialize,
'unique': self.unique, 'unique': self.unique,
} }
@ -91,7 +91,7 @@ class TranslatableFieldMixin:
if issubclass(f, models.Field)][0] if issubclass(f, models.Field)][0]
localized_field = self.base_class( localized_field = self.base_class(
string_concat(self.verbose_name, " (%s)" % lang_code), format_lazy("{} ({})", self.verbose_name, lang_code),
**params **params
) )

Loading…
Cancel
Save