From 85416932358535ca96b8bf06a6755c364b99a455 Mon Sep 17 00:00:00 2001 From: Damian Dimmich Date: Tue, 30 Apr 2019 21:34:42 +0400 Subject: [PATCH 1/2] fix for django 2.1/2.2 --- django_postgres_extensions/admin/options.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/django_postgres_extensions/admin/options.py b/django_postgres_extensions/admin/options.py index dbf496c..95a6c91 100644 --- a/django_postgres_extensions/admin/options.py +++ b/django_postgres_extensions/admin/options.py @@ -1,9 +1,10 @@ from django.contrib.admin.options import ModelAdmin -from django.utils.translation import string_concat, ugettext as _ +from django.utils.translation import ugettext as _ from django.forms.widgets import CheckboxSelectMultiple, SelectMultiple from django_postgres_extensions.models import ArrayManyToManyField from django.contrib.admin import widgets + class PostgresAdmin(ModelAdmin): def formfield_for_manytomany(self, db_field, request=None, **kwargs): @@ -35,7 +36,7 @@ def formfield_for_manytomany(self, db_field, request=None, **kwargs): if isinstance(form_field.widget, SelectMultiple) and not isinstance(form_field.widget, CheckboxSelectMultiple): msg = _('Hold down "Control", or "Command" on a Mac, to select more than one.') help_text = form_field.help_text - form_field.help_text = string_concat(help_text, ' ', msg) if help_text else msg + form_field.help_text = help_text + ' ' + msg if help_text else msg return form_field def formfield_for_dbfield(self, db_field, request, **kwargs): @@ -70,4 +71,4 @@ def formfield_for_dbfield(self, db_field, request, **kwargs): return formfield else: - return super(PostgresAdmin, self).formfield_for_dbfield(db_field, request, **kwargs) \ No newline at end of file + return super(PostgresAdmin, self).formfield_for_dbfield(db_field, request, **kwargs) From a064631a9e7c1e3d162c83d7f3dfd21e48fb6f8b Mon Sep 17 00:00:00 2001 From: Damian Dimmich Date: Tue, 30 Apr 2019 21:40:36 +0400 Subject: [PATCH 2/2] use format_lazy which django suggests as a replacement --- django_postgres_extensions/admin/options.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django_postgres_extensions/admin/options.py b/django_postgres_extensions/admin/options.py index 95a6c91..4c015ea 100644 --- a/django_postgres_extensions/admin/options.py +++ b/django_postgres_extensions/admin/options.py @@ -1,5 +1,6 @@ from django.contrib.admin.options import ModelAdmin from django.utils.translation import ugettext as _ +from django.utils.text import format_lazy from django.forms.widgets import CheckboxSelectMultiple, SelectMultiple from django_postgres_extensions.models import ArrayManyToManyField from django.contrib.admin import widgets @@ -36,7 +37,7 @@ def formfield_for_manytomany(self, db_field, request=None, **kwargs): if isinstance(form_field.widget, SelectMultiple) and not isinstance(form_field.widget, CheckboxSelectMultiple): msg = _('Hold down "Control", or "Command" on a Mac, to select more than one.') help_text = form_field.help_text - form_field.help_text = help_text + ' ' + msg if help_text else msg + form_field.help_text = format_lazy('{} {}', (help_text, msg)) if help_text else msg return form_field def formfield_for_dbfield(self, db_field, request, **kwargs):