diff --git a/coach.php b/coach.php index d7d5bd8..59cbae8 100644 --- a/coach.php +++ b/coach.php @@ -48,23 +48,12 @@ if ($CFG->debugdeveloper) { } $PAGE->requires->js_call_amd('local_treestudyplan/page-coach', 'init', []); -/** - * Shortcut function to provide translations - * @param mixed $str Translation key - * @param null|string[] $param Parameters to pass to translation - * @param string $plugin Location to search for translation strings - * @return string Translation of key - */ -function t($str, $param = null, $plugin = 'local_treestudyplan') { - print get_string($str, $plugin, $param); -} - print $OUTPUT->header(); $text = (object)[ - 'studyplan_select' => t("studyplan_select"), - 'coacheditmode' => t("coacheditmode"), - 'showoverview' => t("showoverview"), - 'studyplan_noneselected' => t("studyplan_noneselected"), + 'studyplan_select' => get_string("studyplan_select", 'local_treestudyplan'), + 'coacheditmode' => get_string("coacheditmode", 'local_treestudyplan'), + 'showoverview' => get_string("showoverview", 'local_treestudyplan'), + 'studyplan_noneselected' => get_string("studyplan_noneselected", 'local_treestudyplan'), ]; print <<requires->js_call_amd('local_treestudyplan/page-edit-plan', 'init', [$stu "defaultAggregation" => get_config("local_treestudyplan", "aggregation_mode"), ]]); -/** - * Shortcut function to provide translations - * - * @param mixed $str Translation key - * @param null|string[] $param Parameters to pass to translation - * @param string $plugin Location to search for translation strings - * @return string Translation of key - */ -function t($str, $param = null, $plugin = 'local_treestudyplan') { - print get_string($str, $plugin, $param); -} - print $OUTPUT->header(); $text = (object)[ - 'loading' => t("loading", null, "core"), - 'studyplan_select' => t("studyplan_select"), - 'studyplan_noneselected' => t("studyplan_noneselected"), + 'loading' => get_string("loading", "core"), + 'studyplan_select' => get_string("studyplan_select", 'local_treestudyplan'), + 'studyplan_noneselected' => get_string("studyplan_noneselected", 'local_treestudyplan'), ]; print <<set_pagelayout('base'); diff --git a/myreport.php b/myreport.php index 5674f0a..bbf3295 100644 --- a/myreport.php +++ b/myreport.php @@ -53,18 +53,6 @@ if ($CFG->debugdeveloper) { } $PAGE->requires->js_call_amd('local_treestudyplan/page-myreport', 'init', [$amteaching ? 'teaching' : 'own']); -/** - * Shortcut function to provide translations - * - * @param mixed $str Translation key - * @param null|string[] $param Parameters to pass to translation - * @param string $plugin Location to search for translation strings - * @return string Translation of key - */ -function t($str, $param = null, $plugin = 'local_treestudyplan') { - print get_string($str, $plugin, $param); -} - print $OUTPUT->header(); print '
'; diff --git a/result-overview.php b/result-overview.php index 4cc80f4..7f13d72 100644 --- a/result-overview.php +++ b/result-overview.php @@ -66,18 +66,6 @@ $PAGE->requires->js_call_amd( [$studyplan->id(), $page->id(), $firstperiod, $lastperiod] ); -/** - * Shortcut function to provide translations - * - * @param mixed $str Translation key - * @param null|string[] $param Parameters to pass to translation - * @param string $plugin Location to search for translation strings - * @return string Translation of key - */ -function t($str, $param = null, $plugin = 'local_treestudyplan') { - print get_string($str, $plugin, $param); -} - print $OUTPUT->header(); print "

{$contextname} / {$studyplan->name()}

"; if ($studyplan->name() != $page->fullname()) { diff --git a/view-plan.php b/view-plan.php index 7d45c15..ea9d5d5 100644 --- a/view-plan.php +++ b/view-plan.php @@ -104,26 +104,14 @@ if ($CFG->debugdeveloper) { } $PAGE->requires->js_call_amd('local_treestudyplan/page-view-plan', 'init', [$studyplancontext->id, $categoryid]); -/** - * Shortcut function to provide translations - * - * @param mixed $str Translation key - * @param null|string[] $param Parameters to pass to translation - * @param string $plugin Location to search for translation strings - * @return string Translation of key - */ -function t($str, $param = null, $plugin = 'local_treestudyplan') { - print get_string($str, $plugin, $param); -} - print $OUTPUT->header(); $text = (object)[ - 'loading' => t("loading", null, "core"), - 'back' => t('back'), - 'studyplan_select' => t("studyplan_select"), - 'selectstudent_btn' => t('selectstudent_btn'), - 'showoverview' => t("showoverview"), - 'studyplan_noneselected' => t("studyplan_noneselected"), + 'loading' => get_string("loading", "core"), + 'back' => get_string('back', 'local_treestudyplan'), + 'studyplan_select' => get_string("studyplan_select", 'local_treestudyplan'), + 'selectstudent_btn' => get_string('selectstudent_btn', 'local_treestudyplan'), + 'showoverview' => get_string("showoverview", 'local_treestudyplan'), + 'studyplan_noneselected' => get_string("studyplan_noneselected", 'local_treestudyplan'), ]; print <<