From 18bbce4ffacd433c18e52ecc2ab1b2e98b3cdec1 Mon Sep 17 00:00:00 2001 From: Justus Dieckmann <justusdieckmann@wwu.de> Date: Tue, 14 Apr 2020 16:41:37 +0200 Subject: [PATCH] Use Term in english strings, use parameter for ST/WT strings --- classes/data_controller.php | 14 ++++++-------- lang/de/customfield_semester.php | 4 ++-- lang/en/customfield_semester.php | 6 +++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/classes/data_controller.php b/classes/data_controller.php index 20da493..f735a1e 100644 --- a/classes/data_controller.php +++ b/classes/data_controller.php @@ -77,17 +77,15 @@ 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] = $summersemesterstring . ' ' . $year; + $formattedoptions[$year * 10] = get_string('summersemester', 'customfield_semester', $year); if ($year == $endyear && $endsemester == 0) { break; } - $formattedoptions[$year * 10 + 1] = $wintersemesterstring . ' ' . $year . '/' . - substr($year + 1, 2, 2); + $formattedoptions[$year * 10 + 1] = get_string('wintersemester', 'customfield_semester', + $year . '/' . substr($year + 1, 2, 2)); } $elementname = $this->get_form_element_name(); @@ -142,10 +140,10 @@ class data_controller extends \core_customfield\data_controller { $year = intdiv($value, 10); $semester = $value % 10; if ($semester === 0) { - return get_string('summersemester', 'customfield_semester') . ' ' . $year; + return get_string('summersemester', 'customfield_semester', $year); } else { - return get_string('wintersemester', 'customfield_semester') . ' ' . $year . '/' . - substr($year + 1, 2, 2); + return get_string('wintersemester', 'customfield_semester', + $year . '/' . substr($year + 1, 2, 2)); } } } diff --git a/lang/de/customfield_semester.php b/lang/de/customfield_semester.php index 1ffb53e..d00a9b7 100644 --- a/lang/de/customfield_semester.php +++ b/lang/de/customfield_semester.php @@ -26,8 +26,8 @@ defined('MOODLE_INTERNAL') || die(); $string['pluginname'] = 'Semesterfeld'; $string['semesterindependent'] = 'Semesterunabhängig'; -$string['summersemester'] = 'SoSe'; -$string['wintersemester'] = 'WiSe'; +$string['summersemester'] = 'SoSe {$a}'; +$string['wintersemester'] = 'WiSe {$a}'; $string['specificsettings'] = 'Einstellungen für das Semesterfeld'; $string['showmonthsintofuture'] = 'Ein Semester ist auswählbar, wenn es in weniger als X Monaten beginnt.'; $string['defaultmonthsintofuture'] = 'Standard ist das Semester in X Monaten.'; diff --git a/lang/en/customfield_semester.php b/lang/en/customfield_semester.php index 15b6bee..80efb3d 100644 --- a/lang/en/customfield_semester.php +++ b/lang/en/customfield_semester.php @@ -25,9 +25,9 @@ defined('MOODLE_INTERNAL') || die(); $string['pluginname'] = 'Semester field'; -$string['semesterindependent'] = 'Semester independent'; -$string['summersemester'] = 'SoSe'; -$string['wintersemester'] = 'WiSe'; +$string['semesterindependent'] = 'Term independent'; +$string['summersemester'] = 'ST {$a}'; +$string['wintersemester'] = 'WT {$a}'; $string['specificsettings'] = 'Semester field settings'; $string['showmonthsintofuture'] = 'A semester will be selectable, if it begins in less than X months.'; $string['defaultmonthsintofuture'] = 'The default option is the semester in X months.'; -- GitLab