Jelix files not updated for the datetimepicker fix

3liz · Sep 12, 2024 · 6858950 · 6858950
1 parent 45f4dce
commit 6858950
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lizmap/www/assets/jelix/jquery/jquery-ui-timepicker-addon-i18n.min.js b/lizmap/www/assets/jelix/jquery/jquery-ui-timepicker-addon-i18n.min.js
diff --git a/lizmap/www/assets/jelix/js/jforms/datetimepickers/default/init.js b/lizmap/www/assets/jelix/js/jforms/datetimepickers/default/init.js
@@ -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);