diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl index 436beb433..9b66c5bc6 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl @@ -19,12 +19,12 @@ <#if theValue?contains("

") > <#assign theValue = theValue?replace("

","

") /> - <#if theValue?matches("^(10-20)\\d\\d[- \\/.](0[1-9]|1[012])[- \\/.](0[1-9]|[12][0-9]|3[01])$") > + <#if theValue?matches("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})") > <#assign theValue = theValue + "T00:00:00" /> ${dt.formatXsdDateTimeLong(theValue, "yearMonthDayPrecision")} - <#elseif theValue?matches("^(10-20)\\d{2}(-|\\/)((0[1-9])|(1[0-2]))(-|\\/)((0[1-9])|([1-2][0-9])|(3[0-1]))(T|\\s)(([0-1][0-9])|(2[0-3])):([0-5][0-9]):([0-5][0-9])")> + <#elseif theValue?matches("^([0-9]{4})-((0[1-9])|(1[0-2]))-((0[1-9])|([1-2][0-9])|(3[0-1]))(T|\\s)(([0-1][0-9])|(2[0-3])):([0-5][0-9]):([0-5][0-9])")> ${dt.formatXsdDateTimeLong(theValue, "yearMonthDayTimePrecision")} - <#elseif theValue?matches("^((10-20)\\d\\d+)-(0[1-9]|1[012])")> + <#elseif theValue?matches("^([0-9]{4})-(0[1-9]|1[012])")> <#assign theValue = theValue + "-01T00:00:00" /> ${dt.formatXsdDateTimeLong(theValue, "yearMonthPrecision")} <#elseif theValue?matches("^--(0[1-9]|1[012])")>