mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 05:53:43 +00:00
5359e6b0d4
This results in a substantial performance improvement for all of
Zulip's backend templates.
Changes in templates:
- Change `block.super` to `super()`.
- Remove `load` tag because Jinja2 doesn't support it.
- Use `minified_js()|safe` instead of `{% minified_js %}`.
- Use `compressed_css()|safe` instead of `{% compressed_css %}`.
- `forloop.first` -> `loop.first`.
- Use `{{ csrf_input }}` instead of `{% csrf_token %}`.
- Use `{# ... #}` instead of `{% comment %}`.
- Use `url()` instead of `{% url %}`.
- Use `_()` instead of `{% trans %}` because in Jinja `trans` is a block tag.
- Use `{% trans %}` instead of `{% blocktrans %}`.
- Use `{% raw %}` instead of `{% verbatim %}`.
Changes in tools:
- Check for `trans` block in `check-templates` instead of `blocktrans`
Changes in backend:
- Create custom `render_to_response` function which takes `request` objects
instead of `RequestContext` object. There are two reasons to do this:
1. `RequestContext` is not compatible with Jinja2
2. `RequestContext` in `render_to_response` is deprecated.
- Add Jinja2 related support files in zproject/jinja2 directory. It
includes a custom backend and a template renderer, compressors for js
and css and Jinja2 environment handler.
- Enable `slugify` and `pluralize` filters in Jinja2 environment.
Fixes #620.
76 lines
3.1 KiB
Python
76 lines
3.1 KiB
Python
"""
|
|
The contents of this file are taken from
|
|
[Django-admin](https://github.com/niwinz/django-jinja/blob/master/django_jinja/management/commands/makemessages.py)
|
|
|
|
Jinja2's i18n functionality is not exactly the same as Django's.
|
|
In particular, the tags names and their syntax are different:
|
|
|
|
1. The Django ``trans`` tag is replaced by a _() global.
|
|
2. The Django ``blocktrans`` tag is called ``trans``.
|
|
|
|
(1) isn't an issue, since the whole ``makemessages`` process is based on
|
|
converting the template tags to ``_()`` calls. However, (2) means that
|
|
those Jinja2 ``trans`` tags will not be picked up by Django's
|
|
``makemessages`` command.
|
|
|
|
There aren't any nice solutions here. While Jinja2's i18n extension does
|
|
come with extraction capabilities built in, the code behind ``makemessages``
|
|
unfortunately isn't extensible, so we can:
|
|
|
|
* Duplicate the command + code behind it.
|
|
* Offer a separate command for Jinja2 extraction.
|
|
* Try to get Django to offer hooks into makemessages().
|
|
* Monkey-patch.
|
|
|
|
We are currently doing that last thing. It turns out there we are lucky
|
|
for once: It's simply a matter of extending two regular expressions.
|
|
Credit for the approach goes to:
|
|
http://stackoverflow.com/questions/2090717/getting-translation-strings-for-jinja2-templates-integrated-with-django-1-x
|
|
|
|
"""
|
|
|
|
import re
|
|
from django.core.management.commands import makemessages
|
|
from django.utils.translation import trans_real
|
|
from django.template.base import BLOCK_TAG_START, BLOCK_TAG_END
|
|
|
|
strip_whitespace_right = re.compile(r"(%s-?\s*(trans|pluralize).*?-%s)\s+" % (BLOCK_TAG_START, BLOCK_TAG_END), re.U)
|
|
strip_whitespace_left = re.compile(r"\s+(%s-\s*(endtrans|pluralize).*?-?%s)" % (BLOCK_TAG_START, BLOCK_TAG_END), re.U)
|
|
|
|
def strip_whitespaces(src):
|
|
src = strip_whitespace_left.sub(r'\1', src)
|
|
src = strip_whitespace_right.sub(r'\1', src)
|
|
return src
|
|
|
|
class Command(makemessages.Command):
|
|
|
|
def handle(self, *args, **options):
|
|
old_endblock_re = trans_real.endblock_re
|
|
old_block_re = trans_real.block_re
|
|
old_constant_re = trans_real.constant_re
|
|
|
|
old_templatize = trans_real.templatize
|
|
# 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.block_re = re.compile(
|
|
trans_real.block_re.pattern + '|' + r"""^-?\s*trans(?:\s+(?!'|")(?=.*?=.*?)|\s*-?$)""")
|
|
trans_real.plural_re = re.compile(
|
|
trans_real.plural_re.pattern + '|' + r"""^-?\s*pluralize(?:\s+.+|-?$)""")
|
|
trans_real.constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?')).*\)""")
|
|
|
|
def my_templatize(src, origin=None):
|
|
new_src = strip_whitespaces(src)
|
|
return old_templatize(new_src, origin)
|
|
|
|
trans_real.templatize = my_templatize
|
|
|
|
try:
|
|
super(Command, self).handle(*args, **options)
|
|
finally:
|
|
trans_real.endblock_re = old_endblock_re
|
|
trans_real.block_re = old_block_re
|
|
trans_real.templatize = old_templatize
|
|
trans_real.constant_re = old_constant_re
|