Skip to content

Commit

Permalink
Unify wording for personal extended deadline in the student UI
Browse files Browse the repository at this point in the history
  • Loading branch information
markkuriekkinen committed Aug 27, 2023
1 parent 3ccd48a commit f43f9cb
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion exercise/templates/exercise/_exercise_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h4 class="panel-title">{% translate "EXERCISE_INFO" %}</h4>
<dd class="exercise-info-deadline">{{ exercise.course_module.closing_time }}</dd>

{% if cached_points.personal_deadline %}
<dt>{% translate "EXTENDED_DEADLINE" %}</dt>
<dt>{% translate "PERSONAL_EXTENDED_DEADLINE" %}</dt>
<dd class="exercise-info-extended-deadline">
{{ cached_points.personal_deadline }}
{% if module.late_submission_penalty > 0 and cached_points.personal_deadline_has_penalty %}
Expand Down
4 changes: 2 additions & 2 deletions exercise/templates/exercise/_user_results.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ <h3 class="panel-title">
{% if entry|deadline_extended_exercise_open:now %}
<span
data-toggle="tooltip"
title="{% translate 'PERSONAL_DEADLINE_DEVIATION' %} {{ entry.personal_deadline }}"
title="{% translate 'PERSONAL_EXTENDED_DEADLINE' %} {{ entry.personal_deadline }}"
>
<span class="glyphicon glyphicon-time" aria-hidden="true"></span>
<span class="sr-only">{% translate 'PERSONAL_DEADLINE_DEVIATION' %} {{ entry.personal_deadline }}</span>
<span class="sr-only">{% translate 'PERSONAL_EXTENDED_DEADLINE' %} {{ entry.personal_deadline }}</span>
</span>
{% endif %}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion exercise/templates/exercise/exercise_plain.html
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<li>
<span class="glyphicon glyphicon-time" aria-hidden="true"></span>
{% if cached_points.personal_deadline %}
{% translate "EXTENDED_DEADLINE" %}
{% translate "PERSONAL_EXTENDED_DEADLINE" %}
{{ cached_points.personal_deadline }}
{% if module.late_submission_penalty > 0 and cached_points.personal_deadline_has_penalty %}
({% blocktranslate trimmed with penalty=module.late_submission_penalty|percent deadline=module.closing_time %}
Expand Down
9 changes: 3 additions & 6 deletions locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3824,9 +3824,10 @@ msgid "POINTS_REQUIRED_TO_PASS"
msgstr "Points required to pass"

#: exercise/templates/exercise/_exercise_info.html
#: exercise/templates/exercise/_user_results.html
#: exercise/templates/exercise/exercise_plain.html
msgid "EXTENDED_DEADLINE"
msgstr "Extended deadline"
msgid "PERSONAL_EXTENDED_DEADLINE"
msgstr "Personal extended deadline"

#: exercise/templates/exercise/_exercise_info.html
#: exercise/templates/exercise/exercise_plain.html
Expand Down Expand Up @@ -4063,10 +4064,6 @@ msgstr "There may be changes in the assignments before the module opens!"
msgid "SUBMISSIONS"
msgstr "Submissions"

#: exercise/templates/exercise/_user_results.html
msgid "PERSONAL_DEADLINE_DEVIATION"
msgstr "Personal deadline extension"

#: exercise/templates/exercise/_user_results.html
#: exercise/templates/exercise/exercise_base.html
#: exercise/templates/exercise/exercise_plain.html
Expand Down
9 changes: 3 additions & 6 deletions locale/fi/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3831,9 +3831,10 @@ msgid "POINTS_REQUIRED_TO_PASS"
msgstr "Pistevaatimus"

#: exercise/templates/exercise/_exercise_info.html
#: exercise/templates/exercise/_user_results.html
#: exercise/templates/exercise/exercise_plain.html
msgid "EXTENDED_DEADLINE"
msgstr "Pidennetty määräaika"
msgid "PERSONAL_EXTENDED_DEADLINE"
msgstr "Henkilökohtainen pidennetty määräaika"

#: exercise/templates/exercise/_exercise_info.html
#: exercise/templates/exercise/exercise_plain.html
Expand Down Expand Up @@ -4073,10 +4074,6 @@ msgstr "Tehtäviin saattaa tulla muutoksia ennen kierroksen avautumista!"
msgid "SUBMISSIONS"
msgstr "Palautukset"

#: exercise/templates/exercise/_user_results.html
msgid "PERSONAL_DEADLINE_DEVIATION"
msgstr "Henkilökohtainen määräaikapidennys"

#: exercise/templates/exercise/_user_results.html
#: exercise/templates/exercise/exercise_base.html
#: exercise/templates/exercise/exercise_plain.html
Expand Down

0 comments on commit f43f9cb

Please sign in to comment.