From e6e75fefc5f54f2dcd2c5b0f8d8de512c4ccde0b Mon Sep 17 00:00:00 2001
From: Justus Dieckmann <justusdieckmann@wwu.de>
Date: Mon, 13 Apr 2020 19:47:56 +0200
Subject: [PATCH] Get summersemester and wintersemester string once and reuse
it; Show winterterm as WiSe YYYY/YY instead of WiSe YYYY/YYYY
---
classes/data_controller.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/classes/data_controller.php b/classes/data_controller.php
index f2842c6..5e860e8 100644
--- a/classes/data_controller.php
+++ b/classes/data_controller.php
@@ -77,15 +77,17 @@ class data_controller extends \core_customfield\data_controller {
$endsemester = $endkey % 10;
$beginofsemesters = $this->get_field()->get_configdata_property('beginofsemesters');
+ $summersemesterstring = get_string('summersemester', 'customfield_semester');
+ $wintersemesterstring = get_string('wintersemester', 'customfield_semester');
for ($year = $beginofsemesters; $year <= $endyear; $year++) {
- $formattedoptions[$year * 10] = get_string('summersemester', 'customfield_semester') . ' ' . $year;
+ $formattedoptions[$year * 10] = $summersemesterstring . ' ' . $year;
if ($year == $endyear && $endsemester == 0) {
break;
}
- $formattedoptions[$year * 10 + 1] =
- get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' . ($year + 1);
+ $formattedoptions[$year * 10 + 1] = $wintersemesterstring . ' ' . $year . '/' .
+ substr($year + 1, 2, 2);
}
$elementname = $this->get_form_element_name();
@@ -142,7 +144,8 @@ class data_controller extends \core_customfield\data_controller {
if ($semester === 0) {
return get_string('summersemester', 'customfield_semester') . ' ' . $year;
} else {
- return get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' . ($year + 1);
+ return get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' .
+ substr($year + 1, 2, 2);
}
}
}
--
GitLab