From f43f9cb2b570ace5a64cd6a9986f313eb0e5e792 Mon Sep 17 00:00:00 2001
From: Markku Riekkinen <markku.riekkinen@aalto.fi>
Date: Sun, 27 Aug 2023 16:58:29 +0300
Subject: [PATCH] Unify wording for personal extended deadline in the student
 UI

---
 exercise/templates/exercise/_exercise_info.html | 2 +-
 exercise/templates/exercise/_user_results.html  | 4 ++--
 exercise/templates/exercise/exercise_plain.html | 2 +-
 locale/en/LC_MESSAGES/django.po                 | 9 +++------
 locale/fi/LC_MESSAGES/django.po                 | 9 +++------
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/exercise/templates/exercise/_exercise_info.html b/exercise/templates/exercise/_exercise_info.html
index 8c4ff71d6..48236ff77 100644
--- a/exercise/templates/exercise/_exercise_info.html
+++ b/exercise/templates/exercise/_exercise_info.html
@@ -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 %}
diff --git a/exercise/templates/exercise/_user_results.html b/exercise/templates/exercise/_user_results.html
index 424efb4a4..69b018140 100644
--- a/exercise/templates/exercise/_user_results.html
+++ b/exercise/templates/exercise/_user_results.html
@@ -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 %}
diff --git a/exercise/templates/exercise/exercise_plain.html b/exercise/templates/exercise/exercise_plain.html
index 18ccd072c..2a5893308 100644
--- a/exercise/templates/exercise/exercise_plain.html
+++ b/exercise/templates/exercise/exercise_plain.html
@@ -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 %}
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 4040dda15..6c9c0eefa 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -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
@@ -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
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 9254feb13..4dd61337b 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -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
@@ -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