Commit b9824ac2 authored by Benjamin Rousselière's avatar Benjamin Rousselière
Browse files

fix/date_format_on_modification

parent feae36b5
Pipeline #6971 canceled with stages
......@@ -120,6 +120,7 @@ class welcome
$this->view->setSource('retentionRules', $retentionRules);
$this->view->setSource('user', $user);
$this->view->setSource('locale', \laabs::configuration('dependency.localisation')['lang']);
$this->view->merge();
$this->view->translate();
return $this->view->saveHtml();
......
......@@ -935,7 +935,7 @@ input:invalid {
field.data('DateTimePicker').format('YYYY-MM-DD HH:mm:ss');
field.data('DateTimePicker').date(data)
} else {
data = new Date(data).toLocaleDateString("fr").replace(/\//g, "-");
data = new Date(data).toLocaleDateString("[?merge locale ?]").replace(/\//g, "-");
field.datepicker('setDate', data);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment