fix: Consider language specifics when parsing time

Closes #946
plankanban · Nov 16, 2024 · 71d0815 · 71d0815
1 parent b700c30
commit 71d0815
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/client/src/components/DueDateEditStep/DueDateEditStep.jsx b/client/src/components/DueDateEditStep/DueDateEditStep.jsx
@@ -67,19 +67,26 @@ const DueDateEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose })
       return;
     }
 
-    const value = parseTime(data.time, nullableDate);
+    let value = t('format:dateTime', {
+      postProcess: 'parseDate',
+      value: `${data.date} ${data.time}`,
+    });
 
     if (Number.isNaN(value.getTime())) {
-      timeField.current.select();
-      return;
+      value = parseTime(data.time, nullableDate);
+
+      if (Number.isNaN(value.getTime())) {
+        timeField.current.select();
+        return;
+      }
     }
 
     if (!defaultValue || value.getTime() !== defaultValue.getTime()) {
       onUpdate(value);
     }
 
     onClose();
-  }, [defaultValue, onUpdate, onClose, data, nullableDate]);
+  }, [defaultValue, onUpdate, onClose, data, nullableDate, t]);
 
   const handleClearClick = useCallback(() => {
     if (defaultValue) {