diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-07 05:37:16 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-07 05:37:16 -0400 |
| commit | 67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce (patch) | |
| tree | 4fe5381c2b2a16f994a8bfa6092db70e77e7a52f /askbot/management | |
| parent | b03f881b11204b7e0fe323dd9148085ef0dfa35d (diff) | |
| parent | 60bc578f579d8b5a40e4c040a0bbd6a60e30e950 (diff) | |
| download | askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.tar.gz askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.tar.bz2 askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.zip | |
merged with the master branch
Diffstat (limited to 'askbot/management')
| -rw-r--r-- | askbot/management/commands/jinja2_makemessages.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/askbot/management/commands/jinja2_makemessages.py b/askbot/management/commands/jinja2_makemessages.py index 4fa05443..fb772ed9 100644 --- a/askbot/management/commands/jinja2_makemessages.py +++ b/askbot/management/commands/jinja2_makemessages.py @@ -43,11 +43,11 @@ class Command(makemessages.Command): # Extend the regular expressions that are used to detect # translation blocks with an "OR jinja-syntax" clause. trans_real.endblock_re = re.compile( - trans_real.endblock_re.pattern + '|' + r"""^\s*endtrans\s*-?$""") + trans_real.endblock_re.pattern + '|' + r"""^-?\s*endtrans\s*-?$""") trans_real.block_re = re.compile( - trans_real.block_re.pattern + '|' + r"""^\s*trans(?:\s*|$)""") + trans_real.block_re.pattern + '|' + r"""^-?\s*trans(?:\s*|$)""") trans_real.plural_re = re.compile( - trans_real.plural_re.pattern + '|' + r"""^\s*pluralize(\s+\w+)?-?$""") + trans_real.plural_re.pattern + '|' + r"""^-?\s*pluralize(\s+\w+)?\s*-?$""") try: super(Command, self).handle(*args, **options) |