Merge "fixed errors when run_tests.sh --makemessages"

This commit is contained in:
Jenkins 2014-10-09 23:35:15 +00:00 committed by Gerrit Code Review
commit 679bd7ba4d
2 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@
<dt>{{ info_key }}</dt>
{% for key, val in info_val.items %}
<dd>
{% blocktrans %}{{ key }}: {% autoescape off %}{{ val }}{% endautoescape %}{% endblocktrans %}
{% autoescape off %} {% blocktrans %}{{ key }}:{{ val | safe }} {% endblocktrans %} {% endautoescape %}
</dd>
{% endfor %}
{% endfor %}

View File

@ -39,7 +39,7 @@
<dd>{{ resource.updated_time|parse_isotime|timesince_or_never }}</dd>
<dt>{% trans "Status" %}</dt>
<dd>
{% blocktrans with resource_status=resource.resource_status|title|replace_underscores resource_status_reason=resource.resource_status_reason % }{{ resource_status }}: {{ resource_status_reason }}{% endblocktrans %}
{% blocktrans with resource_status=resource.resource_status|title|replace_underscores resource_status_reason=resource.resource_status_reason %}{{ resource_status }}: {{ resource_status_reason }}{% endblocktrans %}
</dd>
</dl>
</div>