configure am/pm time-format as user preference (#2789)

2021-11-14 18:18:26 +01:00
parent dce0578a2b
commit 8b0962e192
32 changed files with 216 additions and 260 deletions
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -296,7 +296,7 @@
                    login: '{{ path('fos_user_security_login') }}',
                    locale: '{{ app.request.locale }}',
                    first_dow_iso: {{ iso_day_by_name(app.user.firstDayOfWeek) }},
-                    twentyFourHours: {{ 'true'|hour24('false') }},
+                    twentyFourHours: {{ app.user.is24Hour() ? 'true' : 'false' }},
                    autoComplete: {{ kimai_config.themeAutocompleteCharacters }},
                    defaultColor: '{{ constant('App\\Constants::DEFAULT_COLOR') }}',
                    updateBrowserTitle: {% if app.user.preferenceValue('theme.update_browser_title') %}true{% else %}false{% endif %}