Skip to content
Snippets Groups Projects
Commit ec684e16 authored by Jonathan Weth's avatar Jonathan Weth :keyboard: Committed by root
Browse files

Merge pull request #250 from Katharineum/feature/german-datepicker

Feature/german datepicker
parents db14971c ca780c6c
No related branches found
No related tags found
1 merge request!86Merge school-apps
......@@ -6,5 +6,5 @@
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (school-apps)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (SchoolApps)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
......@@ -23,7 +23,7 @@
<excludeFolder url="file://$MODULE_DIR$/env" />
<excludeFolder url="file://$MODULE_DIR$/schoolapps/staticcollect" />
</content>
<orderEntry type="jdk" jdkName="Python 3.7 (school-apps)" jdkType="Python SDK" />
<orderEntry type="jdk" jdkName="Python 3.7 (SchoolApps)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TemplatesService">
......
......@@ -82,7 +82,7 @@ $(document).ready(function () {
// Buttons
today: 'Heute',
clear: 'Löschen',
cancel: 'Abbrechen',
done: 'OK',
},
......@@ -95,9 +95,11 @@ $(document).ready(function () {
$('.timepicker').timepicker({
twelveHour: false,
autoClose: true,
cancelText: 'Abbrechen',
clearText: 'Löschen',
doneText: 'OK'
i18n: {
cancel: 'Abbrechen',
clear: 'Löschen',
done: 'OK'
},
});
// Initialize tooltip [MAT]
......
......@@ -60,7 +60,7 @@
</footer>
<!---------------->
<!-- JavaScript (jquery v. 3.3.1.slim)-->
<!-- JavaScript (jquery v. 3.4.1.slim)-->
<!---------------->
<script src="{% static 'common/manup.min.js' %}"></script>
<script src="{% static "common/pwabuilder-sw-register.js" %}"></script>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment