PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fi TimeUtil.fullDateFr() compact date format

Browse Source
This commit is contained in:
Marc Baloup 2024-02-14 20:18:01 +01:00
parent d84e4c87dc
commit 07f3841ee6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandalib-util/src/main/java/fr/pandacube/lib/util/TimeUtil.java
View File

@ -257,16 +257,16 @@ public class TimeUtil {
LocalDateTime displayDateTime = toLocalDateTime(timestamp); LocalDateTime displayDateTime = toLocalDateTime(timestamp);
String date = showWeekday ? ((compactWords ? cmpDayOfWeekFormatter : dayOfWeekFormatter).format(displayDateTime) + " ") : ""; String date = showWeekday ? ((compactWords ? cmpDayOfWeekFormatter : dayOfWeekFormatter).format(displayDateTime) + " ") : "";
if (compactDate) { if (compactDate) {
date += compactDateFormatter.format(displayDateTime);
}
else {
date += dayOfMonthFormatter.format(displayDateTime) + " " date += dayOfMonthFormatter.format(displayDateTime) + " "
+ (compactWords ? cmpMonthFormatter : monthFormatter).format(displayDateTime) + " " + (compactWords ? cmpMonthFormatter : monthFormatter).format(displayDateTime) + " "
+ yearFormatter.format(displayDateTime); + yearFormatter.format(displayDateTime);
} }
else {
date += compactDateFormatter.format(displayDateTime);
}
if (precision == DisplayPrecision.DAYS) if (precision == DisplayPrecision.DAYS)
return date; return date;
return date + " à " + dayTimeFr(timestamp, precision); return date + (compactDate ? " " : " à ") + dayTimeFr(timestamp, precision);
} }
/** /**