mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Refs #27067 -- Removed django.utils.translation.string_concat() per deprecation timeline.

Browse Source
This commit is contained in:
Tim Graham
2017-09-02 19:54:21 -04:00
parent 9463a7a8cd
commit 87d2240e6c
4 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/i18n/tests.py
View File

@@ -12,11 +12,9 @@ from django.conf import settings
from django.conf.urls.i18n import i18n_patterns
from django.template import Context, Template
from django.test import (
RequestFactory, SimpleTestCase, TestCase, ignore_warnings,
override_settings,
RequestFactory, SimpleTestCase, TestCase, override_settings,
)
from django.utils import translation
from django.utils.deprecation import RemovedInDjango21Warning
from django.utils.formats import (
date_format, get_format, get_format_modules, iter_format_modules, localize,
localize_input, reset_format_cache, sanitize_separators, time_format,
@@ -27,8 +25,8 @@ from django.utils.translation import (
LANGUAGE_SESSION_KEY, activate, check_for_language, deactivate,
get_language, get_language_bidi, get_language_from_request,
get_language_info, gettext, gettext_lazy, ngettext, ngettext_lazy,
npgettext, npgettext_lazy, pgettext, string_concat, to_locale, trans_real,
ugettext, ugettext_lazy, ungettext, ungettext_lazy,
npgettext, npgettext_lazy, pgettext, to_locale, trans_real, ugettext,
ugettext_lazy, ungettext, ungettext_lazy,
)
from .forms import CompanyForm, I18nForm, SelectDateForm
@@ -216,10 +214,6 @@ class TranslationTests(SimpleTestCase):
self.assertEqual(pgettext("verb", "May"), "Kann")
self.assertEqual(npgettext("search", "%d result", "%d results", 4) % 4, "4 Resultate")
@ignore_warnings(category=RemovedInDjango21Warning)
def test_string_concat(self):
self.assertEqual(str(string_concat('dja', 'ngo')), 'django')
def test_empty_value(self):
"""Empty value must stay empty after being translated (#23196)."""
with translation.override('de'):