Merge pull request #2 from learnweb/fix/review

Use Term in english strings, use parameter for ST/WT strings

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));
             }
         }
     }

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.';

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.';