From e6234d0b610586630d279c1c94935336cfff5118 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 29 May 2019 13:30:54 +0200 Subject: [exams/bootstrap_datepicker] Always load slx-admin language plugin Fixes #3567 --- .../exams/templates/page-add-edit-exam.html | 37 +++++++++------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'modules-available/exams/templates/page-add-edit-exam.html') diff --git a/modules-available/exams/templates/page-add-edit-exam.html b/modules-available/exams/templates/page-add-edit-exam.html index dc29a7f5..d623c68c 100644 --- a/modules-available/exams/templates/page-add-edit-exam.html +++ b/modules-available/exams/templates/page-add-edit-exam.html @@ -158,31 +158,22 @@ function checkGlobalExam() { } document.addEventListener("DOMContentLoaded", function () { - var filename = "modules/bootstrap_datepicker/lang/bootstrap-datepicker." + LANG + ".js"; + moment.locale(LANG); var slxMoment = moment; - $.getScript(filename) - .always(function () { - /* TODO: generalize this (set locale in the clientscript.js of bootstrap_datepicker) */ - var dateSettings = { - format: 'yyyy-mm-dd', - weekStart: 1, - todayHighlight: true, - language: LANG - }; - var timeSettings = { - showSeconds: false, - showMeridian: false, - minuteStep: 5, - appendWidgetTo: 'body' - - }; - $('.datepicker').datepicker(dateSettings); - $('.timepicker2').timepicker(timeSettings); - - startEndChanged(); - }); + var dateSettings = { + format: 'yyyy-mm-dd', + todayHighlight: true, + }; + var timeSettings = { + showSeconds: false, + showMeridian: false, + minuteStep: 5, + appendWidgetTo: 'body', + }; + $('.datepicker').datepicker(dateSettings); + $('.timepicker2').timepicker(timeSettings); $('#locations').multiselect({numberDisplayed: 1}); @@ -253,5 +244,7 @@ document.addEventListener("DOMContentLoaded", function () { window.location.replace("?do=exams"); }); + startEndChanged(); + }, false); // --> -- cgit v1.2.3-55-g7522