matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Converter: Replace deprecated string_concat

Browse Source 
Change the use of string_concat with format_lazy.
string_concat is deprecated in Django 1.11 and removed in
Django 2.1.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-12-05 04:45:12 -04:00
parent c430d471e6
commit 685d9b6d3e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mayan/apps/metadata/forms.py
View File

@@ -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()
)