Got The Translation Strings to Pass Testing! Huzzah for arbitrary namescoping!

openassessment/templates/openassessmentblock/message/oa_message_open.html

@@ -4,9 +4,13 @@
     <div class="message__content">
         <p>
             {% if approaching %}
-                {% blocktrans %}Assignment submissions will close soon. To receive a grade, first provide a response to the question, then complete the steps below the <strong>Your Response</strong> field.{% endblocktrans %}
+                {% blocktrans with start_tag='<strong>'|safe end_tag="</strong>"|safe %}
+                    Assignment submissions will close soon. To receive a grade, first provide a response to the question, then complete the steps below the {{ start_tag }}Your Response{{ end_tag }} field.
+                {% endblocktrans %}
             {% else %}
-                {% blocktrans %}This assignment has several steps. In the first step, you'll provide a response to the question. The other steps appear below the <strong>Your Response</strong> field.{% endblocktrans %}
+                {% blocktrans with start_tag="<strong>"|safe end_tag="</strong>"|safe %}
+                    This assignment has several steps. In the first step, you'll provide a response to the question. The other steps appear below the {{ start_tag }}Your Response{{ end_tag }} field.
+                {% endblocktrans %}
             {% endif %}
         </p>
     </div>

openassessment/templates/openassessmentblock/message/oa_message_peer.html

@@ -22,9 +22,13 @@
                     {% trans "All submitted peer responses have been assessed. Check back later to see if more students have submitted responses. " %}
                 {% endif %}
                 {% if has_self %}
-                    {% blocktrans %}You'll receive your grade after you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps, and after your peers have assessed your response.{% endblocktrans %}
+                    {% blocktrans with peer_start_tag = '<a data-behavior="ui-scroll" href="#openassessment__peer-assessment">'|safe self_start_tag = '<a data-behavior="ui-scroll" href="#openassessment__self-assessment">'|safe end_tag = '</a>'|safe %}
+                          You'll receive your grade after you complete the {{ peer_start_tag }}peer assessment{{ end_tag }} and {{ self_start_tag }}self assessment{{ end_tag }} steps, and after your peers have assessed your response.
+                    {% endblocktrans %}
                 {% else %}
-                    {% blocktrans %}You'll receive your grade after you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> step.{% endblocktrans %}
+                    {% blocktrans with start_tag = '<a data-behavior="ui-scroll" href="#openassessment__peer-assessment">'|safe end_tag = '</a>'|safe %}
+                        You'll receive your grade after you complete the {{ start_tag }}peer assessment{{ end_tag }} step.
+                    {% endblocktrans %}
                 {% endif %}
             {% endif %}
         </p>

openassessment/templates/openassessmentblock/message/oa_message_self.html

@@ -19,9 +19,13 @@
                         <strong> {% trans "Self evaluation of this assignment will close soon. " %} </strong>
                 {% endif %}
                 {% if has_peer %}
-                    {% blocktrans %}You'll receive your grade after the required number of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> step.{% endblocktrans %}
+                    {% blocktrans with start_tag = '<a data-behavior="ui-scroll" href="#openassessment__self-assessment">'|safe end_tag = '</a>'|safe %}
+                          You'll receive your grade after the required number of your peers have assessed your response and you complete the {{ start_tag }}self assessment{{ end_tag }} step.
+                    {% endblocktrans %}
                 {% else %}
-                    {% blocktrans %}You'll receive your grade after you complete the <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> step.{% endblocktrans %}
+                    {% blocktrans with start_tag = '<a data-behavior="ui-scroll" href="#openassessment__self-assessment">'|safe end_tag = '</a>'|safe %}
+                          You'll receive your grade after you complete the {{ start_tag }}self assessment{{ end_tag}} step.
+                    {% endblocktrans %}
                 {% endif %}
             {% endif %}
         </p>

openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html

@@ -26,9 +26,13 @@
         <span class="step__status">
           <span class="step__status__label">{% trans "This step's status" %}:</span>
           <span class="step__status__value">
+            {% with graded=graded must_grade=must_grade %}
             <span class="copy">
-                {% blocktrans with graded=graded must_grade=must_grade%}In Progress (<span class="step__status__value--completed">{{ graded }}</span> of <span class="step__status__value--required">{{ must_grade }}</span>){% endblocktrans %}
+                {% blocktrans with num_graded="<span class=\"step__status__value--completed\">"|add:graded|add:"</span>"|safe num_must_grade="<span class=\"step__status__value--required\">"|add:must_grade|add:"</span>"|safe %}
+                    In Progress ({{ num_graded }} of {{ num_must_grade }})
+                {% endblocktrans %}
             </span>
+            {% endwith %}
           </span>
         </span>
         {% endblock %}
@@ -47,11 +51,13 @@
                         <article class="peer-assessment" id="peer-assessment--001">
                             <div class="peer-assessment__display">
                                 <header class="peer-assessment__display__header">
-                                    {% blocktrans with review_num=review_num must_grade=must_grade%}
+                                    {% with review_num=review_num must_grade=must_grade %}
                                     <h3 class="peer-assessment__display__title">
-                                        Assessment # <span class="peer-assessment__number--current">{{ review_num }}</span> of <span class="peer-assessment__number--required">{{ must_grade }}</span>
+                                        {% blocktrans with review_number='<span>'|add:review_num|add:'</span>'|safe num_must_grade='<span class="peer-assessment__number--required">'|add:must_grade|add:'</span>'|safe %}
+                                            Assessment # {{ review_number }} of {{ num_must_grade }}
+                                        {% endblocktrans %}
                                     </h3>
-                                    {% endblocktrans %}
+                                    {% endwith %}
                                 </header>
 
                                 <div class="peer-assessment__display__response">

openassessment/templates/openassessmentblock/peer/oa_peer_closed.html

@@ -11,7 +11,9 @@
   <span class="step__status__value">
     <span class="copy">
     <i class="ico icon-warning-sign"></i>
-      {% blocktrans with graded=graded must_grade=must_grade %}Incomplete (<span class="step__status__value--completed">{{ graded }}</span> of <span class="step__status__value--required">{{ must_grade }}</span>){% endblocktrans %}
+    {% blocktrans with num_graded="<span class=\"step__status__value--completed\">"|add:graded|add:"</span>"|safe num_must_grade="<span class=\"step__status__value--required\">"|add:must_grade|add:"</span>"|safe %}
+        Incomplete ({{ num_graded }} of {{ num_must_grade }})
+    {% endblocktrans %}
     </span>
   </span>
 </span>
@@ -20,7 +22,6 @@
 {% block body %}
 <div class="ui-toggle-visibility__content">
     <div class="wrapper--step__content">
-
         <div class="step__message message message--incomplete">
             <h3 class="message__title">{% trans "The Due Date for This Step Has Passed" %}</h3>
             <div class="message__content">

openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode.html

@@ -11,7 +11,9 @@
   <span class="step__status__value">
     <i class="ico icon-ok"></i>
     <span class="copy">
-      {% blocktrans with graded=graded %}Complete (<span class="step__status__value--completed">{{ graded }}</span>){% endblocktrans %}
+      {% blocktrans with num_graded='<span class="step__status__value--completed">'|add:graded|add:'</span>'|safe %}
+        Complete ({{ num_graded }})
+      {% endblocktrans %}
     </span>
   </span>
 </span>

openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode_waiting.html

@@ -11,7 +11,9 @@
   <span class="step__status__value">
     <i class="ico icon-ok"></i>
     <span class="copy">
-      {% blocktrans with graded=graded %} Complete (<span class="step__status__value--completed">{{ graded }}</span>){% endblocktrans %}
+      {% blocktrans with num_graded='<span class="step__status__value--completed">'|add:graded|add:'</span>'|safe %}
+        Complete ({{ num_graded }})
+      {% endblocktrans %}
     </span>
   </span>
 </span>

openassessment/templates/openassessmentblock/peer/oa_peer_waiting.html

@@ -10,7 +10,9 @@
   <span class="step__status__label">{% trans "This step's status" %}:</span>
   <span class="step__status__value">
     <span class="copy">
-        {% blocktrans with graded=graded must_grade=must_grade %}In Progress (<span class="step__status__value--completed">{{ graded }}</span> of <span class="step__status__value--required">{{ must_grade }}</span>){% endblocktrans %}
+      {% blocktrans with num_graded="<span class=\"step__status__value--completed\">"|add:graded|add:"</span>"|safe num_must_grade="<span class=\"step__status__value--required\">"|add:must_grade|add:"</span>"|safe %}
+        In Progress ({{ num_graded }} of {{ num_must_grade }})
+      {% endblocktrans %}
     </span>
   </span>
 </span>
@@ -24,7 +26,7 @@
             <h3 class="message__title">{% trans "Waiting for Peer Responses" %}</h3>
 
             <div class="message__content">
-              <p>{% blocktrans %}All submitted peer responses have been assessed. Check back later to see if more students have submitted responses. You'll receive your grade after you've completed all the steps for this problem and your peers have assessed your response.{% endblocktrans %}</p>
+              <p>{% trans "All submitted peer responses have been assessed. Check back later to see if more students have submitted responses. You'll receive your grade after you've completed all the steps for this problem and your peers have assessed your response." %}</p>
             </div>
         </div>
     </div>

openassessment/templates/openassessmentblock/response/oa_response_submitted.html

@@ -23,11 +23,17 @@
             <h3 class="message__title">{% trans "Your Response Has Been Submitted" %}</h3>
             <div class="message__content">
                 {% if has_peer and has_self %}
-                    {% blocktrans %}You'll receive your grade after some of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps{% endblocktrans %}.
+                    {% blocktrans with peer_start_tag='<a data-behavior="ui-scroll" href="#openassessment__peer-assessment">'|safe self_start_tag='<a data-behavior="ui-scroll" href="#openassessment__self-assessment">'|safe end_tag='</a>'|safe %}
+                        You'll receive your grade after some of your peers have assessed your response and you complete the {{ peer_start_tag }}peer assessment{{ end_tag }} and {{ self_start_tag }}self assessment{{ end_tag }} steps.
+                    {% endblocktrans %}
                 {% elif has_peer %}
-                    {% blocktrans %}You'll receive your grade after some of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> step.{% endblocktrans %}
+                    {% blocktrans with start_tag='<a data-behavior="ui-scroll" href="#openassessment__peer-assessment">'|safe end_tag='</a>'|safe %}
+                        You'll receive your grade after some of your peers have assessed your response and you complete the {{ start_tag }}peer assessment{{ end_tag }} step.
+                    {% endblocktrans %}
                 {% elif has_self %}
-                    {% blocktrans %}You'll receive your grade after you complete the <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> step.{% endblocktrans %}
+                    {% blocktrans with start_tag='<a data-behavior="ui-scroll" href="#openassessment__self-assessment">'|safe end_tag='</a>'|safe %}
+                        You'll receive your grade after you complete the {{ start_tag }}self assessment{{ end_tag }} step.
+                    {% endblocktrans %}
                 {% endif %}
             </div>
         </div>

openassessment/templates/openassessmentblock/student_training/student_training.html

@@ -59,9 +59,13 @@
             <div class="step__content">
                 <article class="student-training__display" id="student-training">
                     <header class="student-training__display__header">
+                        {% with training_num_current=training_num_current training_num_available=training_num_available %}
                         <h3 class="student-training__display__title">
-                            {% blocktrans with training_num_current=training_num_current training_num_available=training_num_available %}Training Assessment #<span class="student-training__number--current">{{ training_num_current }}</span> of <span class="student-training__number--required">{{ training_num_available }}</span>{% endblocktrans %}
+                            {% blocktrans with current_progress_num='<span class="student-training__number--current">'|add:training_num_current|add:'</span>'|safe num_to_complete='<span class="student-training__number--required">'|add:training_num_available|add:'</span>'|safe %}
+                                Training Assessment # {{ current_progress_num }} of {{ num_to_complete }}
+                            {% endblocktrans %}
                         </h3>
+                        {% endwith %}
                     </header>
 
                     <div class="student-training__display__response">