Merge branch 'master' into 138_New_map_client

konova/sub_settings/django_settings.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 import os
 from django.utils.translation import gettext_lazy as _
+from django.conf.locale.de import formats as de_formats
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = os.path.dirname(
@@ -162,9 +163,15 @@ LANGUAGES = [
 
 USE_THOUSAND_SEPARATOR = True
 
+# Regular python relevant date/datetime formatting
 DEFAULT_DATE_TIME_FORMAT = '%d.%m.%Y %H:%M:%S'
 DEFAULT_DATE_FORMAT = '%d.%m.%Y'
 
+# Template relevant date/datetime formatting
+# See the Note on here: https://docs.djangoproject.com/en/3.2/ref/templates/builtins/#date
+de_formats.DATETIME_FORMAT = "d.m.Y, H:i"
+de_formats.DATE_FORMAT = "d.m.Y"
+
 TIME_ZONE = 'Europe/Berlin'
 
 USE_I18N = True

konova/sub_settings/table_settings.py

@@ -19,6 +19,6 @@ PAGE_SIZE_OPTIONS_TUPLES = [
     (50, 50),
     (100, 100),
 ]
-PAGE_SIZE_DEFAULT = 5
+PAGE_SIZE_DEFAULT = 10
 PAGE_SIZE_MAX = 100
 PAGE_DEFAULT = 1