Internal: Fix date and time format in datepickers by locale - refs BT#21592

pull/5789/head
christianbeeznst 1 year ago
parent edc593413c
commit ce598542a5
  1. 4
      public/main/inc/lib/formvalidator/Element/DatePicker.php
  2. 4
      public/main/inc/lib/formvalidator/Element/DateTimePicker.php
  3. 2
      src/CoreBundle/DataFixtures/ExtraFieldFixtures.php

@ -101,13 +101,15 @@ class DatePicker extends HTML_QuickForm_text
$localeCode = $this->getLocaleCode();
$id = $this->getAttribute('id');
$altFormat = ($localeCode === 'en') ? 'F d, Y' : 'd F, Y';
return "<script>
document.addEventListener('DOMContentLoaded', function () {
function initializeFlatpickr() {
const fp = flatpickr('#{$id}', {
locale: '{$localeCode}',
altInput: true,
altFormat: '".get_lang('F d, Y')."',
altFormat: '{$altFormat}',
enableTime: false,
dateFormat: 'Y-m-d',
time_24hr: true,

@ -72,13 +72,15 @@ class DateTimePicker extends HTML_QuickForm_text
$localeCode = $this->getLocaleCode();
$id = $this->getAttribute('id');
$altFormat = ($localeCode === 'en') ? 'F d, Y - H:i' : 'd F, Y - H:i';
$js = "<script>
document.addEventListener('DOMContentLoaded', function () {
function initializeFlatpickr() {
const fp = flatpickr('#{$id}', {
locale: '{$localeCode}',
altInput: true,
altFormat: '".get_lang('F d, Y')." ".get_lang('at')." H:i',
altFormat: '{$altFormat}',
enableTime: true,
dateFormat: 'Y-m-d H:i',
time_24hr: true,

@ -389,6 +389,8 @@ class ExtraFieldFixtures extends Fixture implements FixtureGroupInterface
'display_text' => 'GDPR compliance',
'item_type' => ExtraField::USER_FIELD_TYPE,
'value_type' => ExtraField::FIELD_TYPE_CHECKBOX,
'visible_to_self' => true,
'changeable' => true,
],
[
'variable' => 'isFromNewLogin',

Loading…
Cancel
Save