Fix translations unparsable by Django's extractor

Author: quantum5

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,17 @@
             {%- 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 %}
+                    {% with end_time = contest.end_time|date(_("F j, Y, G:i T")), 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)) }}
+                    {% endwith %}
+                {% else %}
+                    {% with 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)) }}
+                    {% endwith %}
+                {% 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 %}