Skip to content

Commit

Permalink
Jelix files not updated for the datetimepicker fix
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentj committed Sep 12, 2024
1 parent 476af77 commit cbeaa59
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,14 @@ var jelix_datetimepicker_default_Manager = {
};
}

if(!control.lang) {
params.dateFormat = 'yy-mm-dd';
params.timeFormat = "hh:mm";
// we force the format, it should correspond to the date we give to the widget
params.dateFormat = 'yy-mm-dd';
params.timeFormat = "HH:mm";

let locale = jFormsJQ.config.locale.split('_',2);
let lang = locale[0];
if (lang in $.timepicker.regional) {
$.timepicker.setDefaults($.timepicker.regional[lang]);
}

elt.datetimepicker(params);
Expand Down

2 comments on commit cbeaa59

@3liz-bot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest weekly run of end2end "playwright" tests failed with this latest commit on the branch release_3_6 😣

CC @nboisteault and @Gustry, please have a look to the logs. Maybe it's a false positive ?

Visit https://github.com/3liz/lizmap-web-client/actions/runs/10877046821

@3liz-bot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest weekly run of end2end "playwright" tests failed with this latest commit on the branch master 😣

CC @nboisteault and @Gustry, please have a look to the logs. Maybe it's a false positive ?

Visit https://github.com/3liz/lizmap-web-client/actions/runs/10877046655

Please sign in to comment.