Skip to content
Snippets Groups Projects
Commit e6e75fef authored by Justus Dieckmann's avatar Justus Dieckmann
Browse files

Get summersemester and wintersemester string once and reuse it; Show...

Get summersemester and wintersemester string once and reuse it; Show winterterm as WiSe YYYY/YY instead of WiSe YYYY/YYYY
parent 6a462953
No related branches found
No related tags found
No related merge requests found
...@@ -77,15 +77,17 @@ class data_controller extends \core_customfield\data_controller { ...@@ -77,15 +77,17 @@ class data_controller extends \core_customfield\data_controller {
$endsemester = $endkey % 10; $endsemester = $endkey % 10;
$beginofsemesters = $this->get_field()->get_configdata_property('beginofsemesters'); $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++) { 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) { if ($year == $endyear && $endsemester == 0) {
break; break;
} }
$formattedoptions[$year * 10 + 1] = $formattedoptions[$year * 10 + 1] = $wintersemesterstring . ' ' . $year . '/' .
get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' . ($year + 1); substr($year + 1, 2, 2);
} }
$elementname = $this->get_form_element_name(); $elementname = $this->get_form_element_name();
...@@ -142,7 +144,8 @@ class data_controller extends \core_customfield\data_controller { ...@@ -142,7 +144,8 @@ class data_controller extends \core_customfield\data_controller {
if ($semester === 0) { if ($semester === 0) {
return get_string('summersemester', 'customfield_semester') . ' ' . $year; return get_string('summersemester', 'customfield_semester') . ' ' . $year;
} else { } else {
return get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' . ($year + 1); return get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' .
substr($year + 1, 2, 2);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment