summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorMattias Loverot <mattias@stubin.se>2016-08-16 12:07:03 +0200
committerTim Graham <timograham@gmail.com>2016-08-25 16:12:40 -0400
commit2315114090815aed72be2b9bc936d7b6374f12fc (patch)
tree6caf23c46dfc24c499fb624a729058973c1e2ef6 /django/utils
parent13c3e5d5a05e9c358d212d154addd703cac3bc66 (diff)
Fixed #27067 -- Deprecated string_concat() in favor of format_lazy().
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/translation/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index c42182d96d..9154ceeb7b 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -4,9 +4,11 @@ Internationalization support.
from __future__ import unicode_literals
import re
+import warnings
from django.utils import six
from django.utils.decorators import ContextDecorator
+from django.utils.deprecation import RemovedInDjango21Warning
from django.utils.encoding import force_text
from django.utils.functional import lazy
@@ -224,6 +226,10 @@ def _string_concat(*strings):
Lazy variant of string concatenation, needed for translations that are
constructed from multiple parts.
"""
+ warnings.warn(
+ 'django.utils.translate.string_concat() is deprecated in '
+ 'favor of django.utils.text.format_lazy().',
+ RemovedInDjango21Warning, stacklevel=2)
return ''.join(force_text(s) for s in strings)
string_concat = lazy(_string_concat, six.text_type)