mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Refs #30585 -- Updated project templates and tests to use (block)translate tags.
This commit is contained in:
committed by
Mariusz Felisiak
parent
d291c72bf2
commit
35d36d9462
@@ -61,7 +61,7 @@ class RenderingTemplatesWithPercentSigns(FrenchTestCase):
|
||||
"""
|
||||
Test rendering of templates that use percent signs.
|
||||
|
||||
Ensures both trans and blocktrans tags behave consistently.
|
||||
Ensures both translate and blocktranslate tags behave consistently.
|
||||
|
||||
Refs #11240, #11966, #24257
|
||||
"""
|
||||
@@ -69,62 +69,62 @@ class RenderingTemplatesWithPercentSigns(FrenchTestCase):
|
||||
def test_translates_with_a_percent_symbol_at_the_end(self):
|
||||
expected = 'Littérale avec un symbole de pour cent à la fin %'
|
||||
|
||||
trans_tpl = Template('{% load i18n %}{% trans "Literal with a percent symbol at the end %" %}')
|
||||
trans_tpl = Template('{% load i18n %}{% translate "Literal with a percent symbol at the end %" %}')
|
||||
self.assertEqual(trans_tpl.render(Context({})), expected)
|
||||
|
||||
block_tpl = Template(
|
||||
'{% load i18n %}{% blocktrans %}Literal with a percent symbol at '
|
||||
'the end %{% endblocktrans %}'
|
||||
'{% load i18n %}{% blocktranslate %}Literal with a percent symbol at '
|
||||
'the end %{% endblocktranslate %}'
|
||||
)
|
||||
self.assertEqual(block_tpl.render(Context({})), expected)
|
||||
|
||||
def test_translates_with_percent_symbol_in_the_middle(self):
|
||||
expected = 'Pour cent littérale % avec un symbole au milieu'
|
||||
|
||||
trans_tpl = Template('{% load i18n %}{% trans "Literal with a percent % symbol in the middle" %}')
|
||||
trans_tpl = Template('{% load i18n %}{% translate "Literal with a percent % symbol in the middle" %}')
|
||||
self.assertEqual(trans_tpl.render(Context({})), expected)
|
||||
|
||||
block_tpl = Template(
|
||||
'{% load i18n %}{% blocktrans %}Literal with a percent % symbol '
|
||||
'in the middle{% endblocktrans %}'
|
||||
'{% load i18n %}{% blocktranslate %}Literal with a percent % symbol '
|
||||
'in the middle{% endblocktranslate %}'
|
||||
)
|
||||
self.assertEqual(block_tpl.render(Context({})), expected)
|
||||
|
||||
def test_translates_with_percent_symbol_using_context(self):
|
||||
trans_tpl = Template('{% load i18n %}{% trans "It is 100%" %}')
|
||||
trans_tpl = Template('{% load i18n %}{% translate "It is 100%" %}')
|
||||
self.assertEqual(trans_tpl.render(Context({})), 'Il est de 100%')
|
||||
trans_tpl = Template('{% load i18n %}{% trans "It is 100%" context "female" %}')
|
||||
trans_tpl = Template('{% load i18n %}{% translate "It is 100%" context "female" %}')
|
||||
self.assertEqual(trans_tpl.render(Context({})), 'Elle est de 100%')
|
||||
|
||||
block_tpl = Template('{% load i18n %}{% blocktrans %}It is 100%{% endblocktrans %}')
|
||||
block_tpl = Template('{% load i18n %}{% blocktranslate %}It is 100%{% endblocktranslate %}')
|
||||
self.assertEqual(block_tpl.render(Context({})), 'Il est de 100%')
|
||||
block_tpl = Template('{% load i18n %}{% blocktrans context "female" %}It is 100%{% endblocktrans %}')
|
||||
block_tpl = Template('{% load i18n %}{% blocktranslate context "female" %}It is 100%{% endblocktranslate %}')
|
||||
self.assertEqual(block_tpl.render(Context({})), 'Elle est de 100%')
|
||||
|
||||
def test_translates_with_string_that_look_like_fmt_spec_with_trans(self):
|
||||
# tests "%s"
|
||||
expected = ('On dirait un spec str fmt %s mais ne devrait pas être interprété comme plus disponible')
|
||||
trans_tpl = Template(
|
||||
'{% load i18n %}{% trans "Looks like a str fmt spec %s but '
|
||||
'{% load i18n %}{% translate "Looks like a str fmt spec %s but '
|
||||
'should not be interpreted as such" %}'
|
||||
)
|
||||
self.assertEqual(trans_tpl.render(Context({})), expected)
|
||||
block_tpl = Template(
|
||||
'{% load i18n %}{% blocktrans %}Looks like a str fmt spec %s but '
|
||||
'should not be interpreted as such{% endblocktrans %}'
|
||||
'{% load i18n %}{% blocktranslate %}Looks like a str fmt spec %s but '
|
||||
'should not be interpreted as such{% endblocktranslate %}'
|
||||
)
|
||||
self.assertEqual(block_tpl.render(Context({})), expected)
|
||||
|
||||
# tests "% o"
|
||||
expected = ('On dirait un spec str fmt % o mais ne devrait pas être interprété comme plus disponible')
|
||||
trans_tpl = Template(
|
||||
'{% load i18n %}{% trans "Looks like a str fmt spec % o but should not be '
|
||||
'{% load i18n %}{% translate "Looks like a str fmt spec % o but should not be '
|
||||
'interpreted as such" %}'
|
||||
)
|
||||
self.assertEqual(trans_tpl.render(Context({})), expected)
|
||||
block_tpl = Template(
|
||||
'{% load i18n %}{% blocktrans %}Looks like a str fmt spec % o but should not be '
|
||||
'interpreted as such{% endblocktrans %}'
|
||||
'{% load i18n %}{% blocktranslate %}Looks like a str fmt spec % o but should not be '
|
||||
'interpreted as such{% endblocktranslate %}'
|
||||
)
|
||||
self.assertEqual(block_tpl.render(Context({})), expected)
|
||||
|
||||
@@ -132,19 +132,19 @@ class RenderingTemplatesWithPercentSigns(FrenchTestCase):
|
||||
expected = ('1 % signe pour cent, signes %% 2 pour cent, trois signes de pourcentage %%%')
|
||||
|
||||
trans_tpl = Template(
|
||||
'{% load i18n %}{% trans "1 percent sign %, 2 percent signs %%, '
|
||||
'{% load i18n %}{% translate "1 percent sign %, 2 percent signs %%, '
|
||||
'3 percent signs %%%" %}'
|
||||
)
|
||||
self.assertEqual(trans_tpl.render(Context({})), expected)
|
||||
block_tpl = Template(
|
||||
'{% load i18n %}{% blocktrans %}1 percent sign %, 2 percent signs '
|
||||
'%%, 3 percent signs %%%{% endblocktrans %}'
|
||||
'{% load i18n %}{% blocktranslate %}1 percent sign %, 2 percent signs '
|
||||
'%%, 3 percent signs %%%{% endblocktranslate %}'
|
||||
)
|
||||
self.assertEqual(block_tpl.render(Context({})), expected)
|
||||
|
||||
block_tpl = Template(
|
||||
'{% load i18n %}{% blocktrans %}{{name}} says: 1 percent sign %, '
|
||||
'2 percent signs %%{% endblocktrans %}'
|
||||
'{% load i18n %}{% blocktranslate %}{{name}} says: 1 percent sign %, '
|
||||
'2 percent signs %%{% endblocktranslate %}'
|
||||
)
|
||||
self.assertEqual(
|
||||
block_tpl.render(Context({"name": "Django"})),
|
||||
|
||||
Reference in New Issue
Block a user