mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-01 12:25:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #16721 -- Made sure that blocktrans correctly handles percents (%), even in the plural block. Thanks for the initial patch, Claude Paroz.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-09-08 13:25:41 +00:00
parent 7cb140e6d8
commit 387e192f25
4 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.mo
View file

Binary file not shown.

12
tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.po
View file

@ -40,3 +40,15 @@ msgid "%d result"
msgid_plural "%d results"
msgstr[0] "%d Resultat"
msgstr[1] "%d Resultate"
#: models.py:13
#, python-format
msgid "The result was %(percent)s%%"
msgstr "Das Ergebnis war %(percent)s%%"
#: models.py:13
#, python-format
msgid "%(percent)s%% represents %(num)s object"
msgid_plural "%(percent)s%% represents %(num)s objects"
msgstr[0] "%(percent)s%% stellt %(num)s Objekt dar"
msgstr[1] "%(percent)s%% stellt %(num)s Objekte dar"

13
tests/regressiontests/i18n/tests.py
View file

@ -618,6 +618,19 @@ class MiscTests(TestCase):
r.META = {'HTTP_ACCEPT_LANGUAGE': 'de'}
self.assertEqual(g(r), 'zh-cn')
def test_percent_in_translatable_block(self):
extended_locale_paths = settings.LOCALE_PATHS + (
os.path.join(here, 'other', 'locale'),
)
with self.settings(LOCALE_PATHS=extended_locale_paths):
t_sing = Template("{% load i18n %}{% blocktrans %}The result was {{ percent }}%{% endblocktrans %}")
t_plur = Template("{% load i18n %}{% blocktrans count num as number %}{{ percent }}% represents {{ num }} object{% plural %}{{ percent }}% represents {{ num }} objects{% endblocktrans %}")
with translation.override('de'):
self.assertEqual(t_sing.render(Context({'percent': 42})), u'Das Ergebnis war 42%')
self.assertEqual(t_plur.render(Context({'percent': 42, 'num': 1})), u'42% stellt 1 Objekt dar')
self.assertEqual(t_plur.render(Context({'percent': 42, 'num': 4})), u'42% stellt 4 Objekte dar')
class ResolutionOrderI18NTests(TestCase):
def setUp(self):