i18n fixes

Properly translate strings *before* passing as variable

openassessment/templates/openassessmentblock/grade/oa_grade_complete.html

@@ -28,9 +28,11 @@
                     <article class="submission__answer__display step__content__section">
                         <h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
 
-                        {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label="Your response to the question above:" %}
+                        {% trans "Your response to the question above:" as translated_label %}
+                        {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %}
 
-                        {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=file_url header="Your Upload" class_prefix="submission__answer" %}
+                        {% trans "Your Upload" as translated_header %}
+                        {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=file_url header=translated_header class_prefix="submission__answer" %}
                     </article>
 
                     <article class="submission__peer-evaluations step__content__section">

openassessment/templates/openassessmentblock/leaderboard/oa_leaderboard_show.html

@@ -20,7 +20,8 @@
                                 {% if topscore.file %}
                                 <img class="leaderboard__score__image" alt="{% trans "The image associated with your peer's submission." %}" src="{{ topscore.file }}" />
                                 {% endif %}
-                                {% include "openassessmentblock/oa_submission_answer.html" with answer=topscore.submission.answer answer_text_label="Your peer's response to the question above:" %}
+                                {% trans "Your peer's response to the question above:" as translated_label %}
+                                {% include "openassessmentblock/oa_submission_answer.html" with answer=topscore.submission.answer answer_text_label=translated_label %}
                             </div>
                         </li>
                     {% endfor %}

openassessment/templates/openassessmentblock/oa_rubric.html

@@ -61,14 +61,14 @@
         {% endfor %}
         <li class="wrapper--input field field--textarea assessment__rubric__question assessment__rubric__question--feedback">
             <label class="question__title" for="{{ rubric_type }}__assessment__rubric__question--feedback__value">
-                <span class="question__title__copy">{% trans rubric_feedback_prompt %}</span>
+                <span class="question__title__copy">{{ rubric_feedback_prompt }}</span>
             </label>
 
             <div class="wrapper--input">
                 <textarea
                     id="{{ rubric_type }}__assessment__rubric__question--feedback__value"
                     class="assessment__rubric__question--feedback__value"
-                    placeholder="{% trans rubric_feedback_default_text %}"
+                    placeholder="{{ rubric_feedback_default_text }}"
                     maxlength="500"
                 >
                 </textarea>

openassessment/templates/openassessmentblock/oa_submission_answer.html

@@ -10,7 +10,7 @@
                 </div>
             </article>
             <div class="submission__answer__part__text">
-                <h2 class="submission__answer__part__text__title">{% trans answer_text_label %}</h2>
+                <h2 class="submission__answer__part__text__title">{{ answer_text_label }}</h2>
                 <div class="submission__answer__part__text__value">
                     {{ part.text|linebreaks }}
                 </div>

openassessment/templates/openassessmentblock/oa_uploaded_file.html

@@ -5,7 +5,7 @@
     {% if header %}
         <header class="{{ class_prefix }}__display__header">
             <h3 class="{{ class_prefix }}__display__title">
-                {% trans header %}
+                {{ header }}
             </h3>
         </header>
     {% endif %}

openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html

@@ -66,9 +66,11 @@
                                     </h3>
                                 </header>
 
-                                {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label="Your peer's response to the question above:" %}
+                                {% trans "Your peer's response to the question above:" as translated_label %}
+                                {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label=translated_label %}
 
-                                {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=peer_file_url header="Associated File" class_prefix="peer-assessment" show_warning="true" %}
+                                {% trans "Associated File"  as translated_header %}
+                                {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=peer_file_url header=translated_header class_prefix="peer-assessment" show_warning="true" %}
                             </div>
 
                             <form id="peer-assessment--001__assessment" class="peer-assessment__assessment" method="post">

openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode.html

@@ -50,9 +50,11 @@
                                 </h3>
                             </header>
 
-                            {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label="Your peer's response to the question above:" %}
+                            {% trans "Your peer's response to the question above:" as translated_label %}
+                            {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label=translated_label %}
 
-                            {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=peer_file_url header="Associated File" class_prefix="peer-assessment" show_warning="true" %}
+                            {% trans "Associated File" as translated_header %}
+                            {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=peer_file_url header=translated_header class_prefix="peer-assessment" show_warning="true" %}
                         </div>
 
                         <form id="peer-assessment--001__assessment" class="peer-assessment__assessment" method="post">

openassessment/templates/openassessmentblock/response/oa_response_graded.html

@@ -22,9 +22,11 @@
             <article class="submission__answer__display">
                 <h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
 
-                {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label="Your response to the question above:" %}
+                {% trans "Your response to the question above:" as translated_label %}
+                {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %}
 
-                {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=file_url header="Your Uploaded File" class_prefix="submission__answer" %}
+                {% trans "Your Uploaded File"  as translated_header %}
+                {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=file_url header=translated_header class_prefix="submission__answer" %}
             </article>
         </div>
     </div>

openassessment/templates/openassessmentblock/response/oa_response_submitted.html

@@ -42,9 +42,11 @@
             <article class="submission__answer__display">
                 <h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
 
-                {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label="Your response to the question above:" %}
+                {% trans "Your response to the question above:" as translated_label %}
+                {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label=translated_label %}
 
-                {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=file_url  header="Your Uploaded File" class_prefix="submission__answer" %}
+                {% trans "Your Uploaded File"  as translated_header %}
+                {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=file_url header=translated_header class_prefix="submission__answer" %}
             </article>
         </div>
     </div>

openassessment/templates/openassessmentblock/self/oa_self_assessment.html

@@ -43,9 +43,11 @@
                         <h3 class="self-assessment__display__title">{% trans "Your Response" %}</h3>
                     </header>
 
-                    {% include "openassessmentblock/oa_submission_answer.html" with answer=self_submission.answer answer_text_label="Your response to the question above:" %}
+                    {% trans "Your response to the question above:" as translated_label %}
+                    {% include "openassessmentblock/oa_submission_answer.html" with answer=self_submission.answer answer_text_label=translated_label %}
 
-                    {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=self_file_url header="Associated File" class_prefix="self-assessment" %}
+                    {% trans "Associated File" as translated_header %}
+                    {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=self_file_url header=translated_header class_prefix="self-assessment" %}
                 </article>
 
                 <form id="self-assessment--001__assessment" class="self-assessment__assessment" method="post">

openassessment/templates/openassessmentblock/staff_area/oa_staff_grade_learners_assessment.html

@@ -18,9 +18,11 @@
                             </h4>
                         </header>
 
-                        {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label="The learner's response to the question above:" %}
+                        {% trans "The learner's response to the question above:" as translated_label %}
+                        {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %}
 
-                        {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=staff_file_url header="Associated File" class_prefix="staff-assessment" show_warning="true" %}
+                        {% trans "Associated File" as translated_header %}
+                        {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=staff_file_url header=translated_header class_prefix="staff-assessment" show_warning="true" %}
                     </div>
 
                     <form class="staff-assessment__assessment" method="post">

openassessment/templates/openassessmentblock/staff_area/oa_staff_override_assessment.html

@@ -17,9 +17,11 @@
                         </h3>
                     </header>
 
-                    {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label="The learner's response to the question above:" %}
+                    {% trans "The learner's response to the question above:" as translated_label %}
+                    {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %}
 
-                    {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=staff_file_url header="Associated File" class_prefix="staff-assessment" show_warning="true" %}
+                    {% trans "Associated File" as translated_header %}
+                    {% include "openassessmentblock/oa_uploaded_file.html" with file_upload_type=file_upload_type file_url=staff_file_url header=translated_header class_prefix="staff-assessment" show_warning="true" %}
                 </div>
 
                 <form class="staff-assessment__assessment" method="post">

openassessment/templates/openassessmentblock/staff_area/oa_student_info.html

@@ -33,7 +33,8 @@
                     </p>
                 {% else %}
                     <div class="wrapper--content">
-                        {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label="The learner's response to the question above:" %}
+                        {% trans "The learner's response to the question above:" as translated_label %}
+                        {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label=translated_label %}
 
                         {% if submission.file_url %}
                             <a href="{{ submission.file_url }}" class="submission--file">

openassessment/templates/openassessmentblock/student_training/student_training.html

@@ -72,7 +72,8 @@
                         {% endwith %}
                     </header>
 
-                    {% include "openassessmentblock/oa_submission_answer.html" with answer=training_essay.answer answer_text_label="The response to the question above:" %}
+                    {% trans "The response to the question above:" as translated_label %}
+                    {% include "openassessmentblock/oa_submission_answer.html" with answer=training_essay.answer answer_text_label=translated_label %}
 
                 </article>