diff --git a/mayan/apps/converter/transformations.py b/mayan/apps/converter/transformations.py index 6e95fc3f04..2bf4371f62 100644 --- a/mayan/apps/converter/transformations.py +++ b/mayan/apps/converter/transformations.py @@ -5,7 +5,8 @@ import logging from PIL import Image, ImageColor, ImageFilter -from django.utils.translation import string_concat, ugettext_lazy as _ +from django.utils.text import format_lazy +from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import force_bytes logger = logging.getLogger(__name__) @@ -51,7 +52,9 @@ class BaseTransformation(object): @classmethod def get_label(cls): if cls.arguments: - return string_concat(cls.label, ': ', ', '.join(cls.arguments)) + return format_lazy( + '{}{}{}', cls.label, ': ', ', '.join(cls.arguments) + ) else: return cls.label diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py index 9c6c2663dc..0b3baeec8e 100644 --- a/mayan/apps/metadata/forms.py +++ b/mayan/apps/metadata/forms.py @@ -3,7 +3,8 @@ from __future__ import unicode_literals from django import forms from django.core.exceptions import ValidationError from django.forms.formsets import formset_factory -from django.utils.translation import string_concat, ugettext_lazy as _ +from django.utils.text import format_lazy +from django.utils.translation import ugettext_lazy as _ from .classes import MetadataLookup from .models import DocumentTypeMetadataType, MetadataType @@ -146,8 +147,8 @@ class DocumentAddMetadataForm(forms.Form): class MetadataTypeForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(MetadataTypeForm, self).__init__(*args, **kwargs) - self.fields['lookup'].help_text = string_concat( - self.fields['lookup'].help_text, + self.fields['lookup'].help_text = format_lazy( + '{}{}{}', self.fields['lookup'].help_text, _(' Available template context variables: '), MetadataLookup.get_as_help_text() )