diff options
Diffstat (limited to 'tests/template_tests/syntax_tests/i18n/test_translate.py')
| -rw-r--r-- | tests/template_tests/syntax_tests/i18n/test_translate.py | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/tests/template_tests/syntax_tests/i18n/test_translate.py b/tests/template_tests/syntax_tests/i18n/test_translate.py index 6011153a2d..55fdb92f7a 100644 --- a/tests/template_tests/syntax_tests/i18n/test_translate.py +++ b/tests/template_tests/syntax_tests/i18n/test_translate.py @@ -15,9 +15,9 @@ from .base import MultipleLocaleActivationTestCase, extended_locale_paths def setup(templates, *args, **kwargs): - trans_setup = base_setup(templates, *args, **kwargs) - translate_setup = base_setup({ - name: template.replace('{% trans ', '{% translate ') + translate_setup = base_setup(templates, *args, **kwargs) + trans_setup = base_setup({ + name: template.replace('{% translate ', '{% trans ') for name, template in templates.items() }) @@ -42,118 +42,118 @@ def setup(templates, *args, **kwargs): class I18nTransTagTests(SimpleTestCase): libraries = {'i18n': 'django.templatetags.i18n'} - @setup({'i18n01': '{% load i18n %}{% trans \'xxxyyyxxx\' %}'}) + @setup({'i18n01': '{% load i18n %}{% translate \'xxxyyyxxx\' %}'}) def test_i18n01(self): """simple translation of a string delimited by '.""" output = self.engine.render_to_string('i18n01') self.assertEqual(output, 'xxxyyyxxx') - @setup({'i18n02': '{% load i18n %}{% trans "xxxyyyxxx" %}'}) + @setup({'i18n02': '{% load i18n %}{% translate "xxxyyyxxx" %}'}) def test_i18n02(self): """simple translation of a string delimited by ".""" output = self.engine.render_to_string('i18n02') self.assertEqual(output, 'xxxyyyxxx') - @setup({'i18n06': '{% load i18n %}{% trans "Page not found" %}'}) + @setup({'i18n06': '{% load i18n %}{% translate "Page not found" %}'}) def test_i18n06(self): """simple translation of a string to German""" with translation.override('de'): output = self.engine.render_to_string('i18n06') self.assertEqual(output, 'Seite nicht gefunden') - @setup({'i18n09': '{% load i18n %}{% trans "Page not found" noop %}'}) + @setup({'i18n09': '{% load i18n %}{% translate "Page not found" noop %}'}) def test_i18n09(self): """simple non-translation (only marking) of a string to German""" with translation.override('de'): output = self.engine.render_to_string('i18n09') self.assertEqual(output, 'Page not found') - @setup({'i18n20': '{% load i18n %}{% trans andrew %}'}) + @setup({'i18n20': '{% load i18n %}{% translate andrew %}'}) def test_i18n20(self): output = self.engine.render_to_string('i18n20', {'andrew': 'a & b'}) self.assertEqual(output, 'a & b') - @setup({'i18n22': '{% load i18n %}{% trans andrew %}'}) + @setup({'i18n22': '{% load i18n %}{% translate andrew %}'}) def test_i18n22(self): output = self.engine.render_to_string('i18n22', {'andrew': mark_safe('a & b')}) self.assertEqual(output, 'a & b') - @setup({'i18n23': '{% load i18n %}{% trans "Page not found"|capfirst|slice:"6:" %}'}) + @setup({'i18n23': '{% load i18n %}{% translate "Page not found"|capfirst|slice:"6:" %}'}) def test_i18n23(self): - """Using filters with the {% trans %} tag (#5972).""" + """Using filters with the {% translate %} tag (#5972).""" with translation.override('de'): output = self.engine.render_to_string('i18n23') self.assertEqual(output, 'nicht gefunden') - @setup({'i18n24': '{% load i18n %}{% trans \'Page not found\'|upper %}'}) + @setup({'i18n24': '{% load i18n %}{% translate \'Page not found\'|upper %}'}) def test_i18n24(self): with translation.override('de'): output = self.engine.render_to_string('i18n24') self.assertEqual(output, 'SEITE NICHT GEFUNDEN') - @setup({'i18n25': '{% load i18n %}{% trans somevar|upper %}'}) + @setup({'i18n25': '{% load i18n %}{% translate somevar|upper %}'}) def test_i18n25(self): with translation.override('de'): output = self.engine.render_to_string('i18n25', {'somevar': 'Page not found'}) self.assertEqual(output, 'SEITE NICHT GEFUNDEN') # trans tag with as var - @setup({'i18n35': '{% load i18n %}{% trans "Page not found" as page_not_found %}{{ page_not_found }}'}) + @setup({'i18n35': '{% load i18n %}{% translate "Page not found" as page_not_found %}{{ page_not_found }}'}) def test_i18n35(self): with translation.override('de'): output = self.engine.render_to_string('i18n35') self.assertEqual(output, 'Seite nicht gefunden') @setup({'i18n36': '{% load i18n %}' - '{% trans "Page not found" noop as page_not_found %}{{ page_not_found }}'}) + '{% translate "Page not found" noop as page_not_found %}{{ page_not_found }}'}) def test_i18n36(self): with translation.override('de'): output = self.engine.render_to_string('i18n36') self.assertEqual(output, 'Page not found') - @setup({'template': '{% load i18n %}{% trans %}A}'}) + @setup({'template': '{% load i18n %}{% translate %}A}'}) def test_syntax_error_no_arguments(self, tag_name): msg = "'{}' takes at least one argument".format(tag_name) with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "Yes" badoption %}'}) + @setup({'template': '{% load i18n %}{% translate "Yes" badoption %}'}) def test_syntax_error_bad_option(self, tag_name): msg = "Unknown argument for '{}' tag: 'badoption'".format(tag_name) with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "Yes" as %}'}) + @setup({'template': '{% load i18n %}{% translate "Yes" as %}'}) def test_syntax_error_missing_assignment(self, tag_name): msg = "No argument provided to the '{}' tag for the as option.".format(tag_name) with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "Yes" as var context %}'}) + @setup({'template': '{% load i18n %}{% translate "Yes" as var context %}'}) def test_syntax_error_missing_context(self, tag_name): msg = "No argument provided to the '{}' tag for the context option.".format(tag_name) with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "Yes" context as var %}'}) + @setup({'template': '{% load i18n %}{% translate "Yes" context as var %}'}) def test_syntax_error_context_as(self, tag_name): msg = "Invalid argument 'as' provided to the '{}' tag for the context option".format(tag_name) with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "Yes" context noop %}'}) + @setup({'template': '{% load i18n %}{% translate "Yes" context noop %}'}) def test_syntax_error_context_noop(self, tag_name): msg = "Invalid argument 'noop' provided to the '{}' tag for the context option".format(tag_name) with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "Yes" noop noop %}'}) + @setup({'template': '{% load i18n %}{% translate "Yes" noop noop %}'}) def test_syntax_error_duplicate_option(self): msg = "The 'noop' option was specified more than once." with self.assertRaisesMessage(TemplateSyntaxError, msg): self.engine.render_to_string('template') - @setup({'template': '{% load i18n %}{% trans "%s" %}'}) + @setup({'template': '{% load i18n %}{% translate "%s" %}'}) def test_trans_tag_using_a_string_that_looks_like_str_fmt(self): output = self.engine.render_to_string('template') self.assertEqual(output, '%s') @@ -165,51 +165,51 @@ class TranslationTransTagTests(SimpleTestCase): def get_template(self, template_string): return Template( template_string.replace( - '{{% trans ', + '{{% translate ', '{{% {}'.format(self.tag_name) ) ) @override_settings(LOCALE_PATHS=extended_locale_paths) def test_template_tags_pgettext(self): - """{% trans %} takes message contexts into account (#14806).""" + """{% translate %} takes message contexts into account (#14806).""" trans_real._active = Local() trans_real._translations = {} with translation.override('de'): # Nonexistent context... - t = self.get_template('{% load i18n %}{% trans "May" context "nonexistent" %}') + t = self.get_template('{% load i18n %}{% translate "May" context "nonexistent" %}') rendered = t.render(Context()) self.assertEqual(rendered, 'May') # Existing context... using a literal - t = self.get_template('{% load i18n %}{% trans "May" context "month name" %}') + t = self.get_template('{% load i18n %}{% translate "May" context "month name" %}') rendered = t.render(Context()) self.assertEqual(rendered, 'Mai') - t = self.get_template('{% load i18n %}{% trans "May" context "verb" %}') + t = self.get_template('{% load i18n %}{% translate "May" context "verb" %}') rendered = t.render(Context()) self.assertEqual(rendered, 'Kann') # Using a variable - t = self.get_template('{% load i18n %}{% trans "May" context message_context %}') + t = self.get_template('{% load i18n %}{% translate "May" context message_context %}') rendered = t.render(Context({'message_context': 'month name'})) self.assertEqual(rendered, 'Mai') - t = self.get_template('{% load i18n %}{% trans "May" context message_context %}') + t = self.get_template('{% load i18n %}{% translate "May" context message_context %}') rendered = t.render(Context({'message_context': 'verb'})) self.assertEqual(rendered, 'Kann') # Using a filter - t = self.get_template('{% load i18n %}{% trans "May" context message_context|lower %}') + t = self.get_template('{% load i18n %}{% translate "May" context message_context|lower %}') rendered = t.render(Context({'message_context': 'MONTH NAME'})) self.assertEqual(rendered, 'Mai') - t = self.get_template('{% load i18n %}{% trans "May" context message_context|lower %}') + t = self.get_template('{% load i18n %}{% translate "May" context message_context|lower %}') rendered = t.render(Context({'message_context': 'VERB'})) self.assertEqual(rendered, 'Kann') # Using 'as' - t = self.get_template('{% load i18n %}{% trans "May" context "month name" as var %}Value: {{ var }}') + t = self.get_template('{% load i18n %}{% translate "May" context "month name" as var %}Value: {{ var }}') rendered = t.render(Context()) self.assertEqual(rendered, 'Value: Mai') - t = self.get_template('{% load i18n %}{% trans "May" as var context "verb" %}Value: {{ var }}') + t = self.get_template('{% load i18n %}{% translate "May" as var context "verb" %}Value: {{ var }}') rendered = t.render(Context()) self.assertEqual(rendered, 'Value: Kann') @@ -224,7 +224,7 @@ class MultipleLocaleActivationTransTagTests(MultipleLocaleActivationTestCase): def get_template(self, template_string): return Template( template_string.replace( - '{{% trans ', + '{{% translate ', '{{% {}'.format(self.tag_name) ) ) @@ -236,25 +236,25 @@ class MultipleLocaleActivationTransTagTests(MultipleLocaleActivationTestCase): """ with translation.override('fr'): self.assertEqual( - self.get_template("{% load i18n %}{% trans 'Yes' %}").render(Context({})), + self.get_template("{% load i18n %}{% translate 'Yes' %}").render(Context({})), 'Oui' ) def test_multiple_locale_trans(self): with translation.override('de'): - t = self.get_template("{% load i18n %}{% trans 'No' %}") + t = self.get_template("{% load i18n %}{% translate 'No' %}") with translation.override(self._old_language), translation.override('nl'): self.assertEqual(t.render(Context({})), 'Nee') def test_multiple_locale_deactivate_trans(self): with translation.override('de', deactivate=True): - t = self.get_template("{% load i18n %}{% trans 'No' %}") + t = self.get_template("{% load i18n %}{% translate 'No' %}") with translation.override('nl'): self.assertEqual(t.render(Context({})), 'Nee') def test_multiple_locale_direct_switch_trans(self): with translation.override('de'): - t = self.get_template("{% load i18n %}{% trans 'No' %}") + t = self.get_template("{% load i18n %}{% translate 'No' %}") with translation.override('nl'): self.assertEqual(t.render(Context({})), 'Nee') |
