fix #2460 replace with ZonedDateTime
This commit is contained in:
parent
92be3988c4
commit
fc4e149dad
3 changed files with 21 additions and 1 deletions
|
@ -26,6 +26,7 @@ import java.text.DecimalFormat;
|
|||
import java.text.NumberFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Base64;
|
||||
|
@ -164,6 +165,13 @@ public class FessFunctions {
|
|||
return date.format(DateTimeFormatter.ofPattern(Constants.ISO_DATETIME_FORMAT, Locale.ROOT));
|
||||
}
|
||||
|
||||
public static String formatDate(final ZonedDateTime date, final String format) {
|
||||
if (date == null) {
|
||||
return StringUtil.EMPTY;
|
||||
}
|
||||
return date.format(DateTimeFormatter.ofPattern(format, Locale.ROOT));
|
||||
}
|
||||
|
||||
public static String formatDuration(final long durationMillis) {
|
||||
return DurationFormatUtils.formatDuration(durationMillis, "d 'days' HH:mm:ss.SSS").replace("0 days", StringUtil.EMPTY).trim();
|
||||
|
||||
|
|
|
@ -83,6 +83,18 @@
|
|||
</example>
|
||||
</function>
|
||||
|
||||
<function>
|
||||
<description>
|
||||
Returns formatted date from a given value.
|
||||
</description>
|
||||
<name>formatDate</name>
|
||||
<function-class>org.codelibs.fess.taglib.FessFunctions</function-class>
|
||||
<function-signature>java.lang.String formatDate(java.time.ZonedDateTime, java.lang.String)</function-signature>
|
||||
<example>
|
||||
${fe:formatDate(d, 'yyyy')}
|
||||
</example>
|
||||
</function>
|
||||
|
||||
<function>
|
||||
<description>
|
||||
Returns formatted number as a file size from a given value.
|
||||
|
|
|
@ -178,7 +178,7 @@
|
|||
${f:h(data.name)}
|
||||
</td>
|
||||
<td>${f:h(data.size)}</td>
|
||||
<td><fmt:formatDate value="${data.lastModified}" type="BOTH" pattern="yyyy-MM-dd HH:mm:ss" /></td>
|
||||
<td>${fe:formatDate(data.lastModified, 'yyyy-MM-dd HH:mm:ss')}</td>
|
||||
</c:if>
|
||||
<c:if test="${data.directory.booleanValue()}">
|
||||
<tr data-href="${contextPath}/admin/storage/list/${f:h(data.id)}/">
|
||||
|
|
Loading…
Add table
Reference in a new issue