jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kevin Papst
2021-11-14 18:18:26 +01:00
committed by GitHub
parent dce0578a2b
commit 8b0962e192
32 changed files with 216 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/base.html.twig
View File

@@ -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 %}

2
templates/export/renderer/default.html.twig
View File

@@ -309,7 +309,7 @@
|
<label class="control-label" for="begin-format">
{{ 'label.begin'|trans }}:
{% set demo_date = create_date('2020-01-01 13:00:00') %}
{% set demo_date = create_date('2020-01-01 11:00:00') %}
<select id="begin-format" name="begin-format">
<option value="plain">{{ demo_date|date_format('H:i') }}</option>
<option value="time">{{ demo_date|date_time }}</option>