Fix translations unparsable by Django's extractor

judge/jinja2/__init__.py

@@ -8,7 +8,7 @@
 
 from judge.highlight_code import highlight_code
 from judge.user_translations import gettext
-from . import (camo, datetime, filesize, gravatar, language, markdown, rating, reference, render, social,
+from . import (camo, datetime, filesize, format, gravatar, language, markdown, rating, reference, render, social,
                spaceless, submission, timedelta)
 from . import registry
 

judge/jinja2/format.py

@@ -0,0 +1,8 @@
+from django.utils.html import format_html
+
+from . import registry
+
+
+@registry.function
+def bold(text):
+    return format_html('<b>{0}</b>', text)

templates/base.html

@@ -210,7 +210,7 @@
                         <a href="{{ url('user_page') }}">
                             <span>
                                 <img src="{{ gravatar(request.user, 32) }}" height="24" width="24">{# -#}
-                                <span>{{ _('Hello, %(username)s.', username=('<b>%s</b>'|safe|format(request.profile.display_name))) }}</span>
+                                <span>{{ _('Hello, %(username)s.', username=bold(request.profile.display_name)) }}</span>
                             </span>
                         </a>
                         <ul style="width: 150px">

templates/contest/contest.html

@@ -55,16 +55,16 @@
             {%- endif -%}
         </a>
         <div id="time">
-            {% if contest.time_limit %}
-                {{ _('%(time_limit)s window between %(start_time)s and %(end_time)s',
-                     start_time='<b>%s</b>'|safe|format(contest.start_time|date(_("F j, Y, G:i T"))),
-                     end_time='<b>%s</b>'|safe|format(contest.end_time|date(_("F j, Y, G:i T"))),
-                     time_limit='<b>%s</b>'|safe|format(contest.time_limit|timedelta('localized-no-seconds'))) }}
-            {% else %}
-                {{ _('%(length)s long starting on %(start_time)s',
-                     start_time='<b>%s</b>'|safe|format(contest.start_time|date(_("F j, Y, G:i T"))),
-                     length='<b>%s</b>'|safe|format(contest.contest_window_length|timedelta('localized-no-seconds'))) }}
-            {% endif %}
+            {% with start_time=contest.start_time|date(_("F j, Y, G:i T")) %}
+                {% if contest.time_limit %}
+                    {% set end_time=contest.end_time|date(_("F j, Y, G:i T")) %}
+                    {% set time_limit=contest.time_limit|timedelta('localized-no-seconds') %}
+                    {{ _('%(time_limit)s window between %(start_time)s and %(end_time)s', start_time=bold(start_time), end_time=bold(end_time), time_limit=bold(time_limit)) }}
+                {% else %}
+                    {% set length=contest.contest_window_length|timedelta('localized-no-seconds') %}
+                    {{ _('%(length)s long starting on %(start_time)s', start_time=bold(start_time), length=bold(length)) }}
+                {% endif %}
+            {% endwith %}
         </div>
         {% if contest.show_short_display %}
             <div id="details">

templates/problem/submit.html

@@ -202,8 +202,7 @@
             <div class="alert alert-warning alert-dismissable">
                 <a class="close">x</a>
                 <b>{{ _('Warning!') }}</b>
-                {{ _('Your default language, %(language)s, is unavailable for this problem and has been deselected.',
-                     language='<b>%s</b>'|safe|format(default_lang.name)) }}
+                {{ _('Your default language, %(language)s, is unavailable for this problem and has been deselected.', language=bold(default_lang.name)) }}
             </div>
         {% endif %}
 

templates/registration/password_change_form.html

@@ -4,8 +4,8 @@
     <div class="centered-form">
         <form action="" method="post" class="form-area">
             {% if request.session.password_pwned %}
-                <h4>{{ _('We found your password in <a href="https://haveibeenpwned.com/Passwords">a database of compromised passwords</a>. 
-                      To protect your account, we are requiring you to change your password to a more secure password.') }}</h4>
+                <h4>{{ (_('We found your password in [a database of compromised passwords][0].') + '\n\n  [0]: https://haveibeenpwned.com/Passwords')|markdown('default', strip_paragraphs=True) }}
+                    {{ _('To protect your account, we are requiring you to change your password to a more secure password.') }}</h4>
             {% endif %}
             {% csrf_token %}
             <table border="0" class="django-as-table">{{ form.as_table() }}</table>

templates/submission/status-testcases.html

@@ -147,12 +147,13 @@ <h3>{{ _('Execution Results') }}</h3>
                 {{ submission.case_points|floatformat(0) }}/{{ submission.case_total|floatformat(0) }}
                 {% if request.in_contest and submission.contest_or_none %}
                     {% with contest=submission.contest_or_none %}
-                        ({{ _('%(points)s/%(total)s points', points=contest.points|roundfloat(3),
-                              total=contest.problem.points|floatformat(-1)) }})
+                        {% set points=contest.points|roundfloat(3) %}
+                        {% set total=contest.problem.points|floatformat(-1) %}
+                        ({{ _('%(points)s/%(total)s points', points=points, total=total) }})
                     {% endwith %}
                 {% else %}
-                    ({{ _('%(points)s/%(total)s points', points=submission.points|roundfloat(3),
-                          total=submission.problem.points|floatformat(-1)) }})
+                    {% with points=submission.points|roundfloat(3), total=submission.problem.points|floatformat(-1) %}
+                    ({{ _('%(points)s/%(total)s points', points=points, total=total) }})
                 {% endif %}
                 {% if is_pretest and submission.result == "AC" %}
                     <br>