From b0e585841c7c978e66629ee69fd3c9855277fce7 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 7 Apr 2024 12:44:58 +0100 Subject: [PATCH] refactor: use system locale for date formatting --- .../net/william278/husksync/command/EnderChestCommand.java | 4 +++- .../net/william278/husksync/command/InventoryCommand.java | 4 +++- .../java/net/william278/husksync/util/DataSnapshotList.java | 5 +++-- .../net/william278/husksync/util/DataSnapshotOverview.java | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java b/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java index 6d81ae3a..4c361918 100644 --- a/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java +++ b/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java @@ -30,6 +30,7 @@ import net.william278.husksync.user.User; import org.jetbrains.annotations.NotNull; import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.List; import java.util.Optional; @@ -51,7 +52,8 @@ public class EnderChestCommand extends ItemsCommand { // Display opening message plugin.getLocales().getLocale("ender_chest_viewer_opened", user.getUsername(), - snapshot.getTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy, HH:mm"))) + snapshot.getTimestamp().format(DateTimeFormatter + .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT))) .ifPresent(viewer::sendMessage); // Show GUI diff --git a/common/src/main/java/net/william278/husksync/command/InventoryCommand.java b/common/src/main/java/net/william278/husksync/command/InventoryCommand.java index 1523d3d7..ad710147 100644 --- a/common/src/main/java/net/william278/husksync/command/InventoryCommand.java +++ b/common/src/main/java/net/william278/husksync/command/InventoryCommand.java @@ -30,6 +30,7 @@ import net.william278.husksync.user.User; import org.jetbrains.annotations.NotNull; import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.List; import java.util.Optional; @@ -51,7 +52,8 @@ public class InventoryCommand extends ItemsCommand { // Display opening message plugin.getLocales().getLocale("inventory_viewer_opened", user.getUsername(), - snapshot.getTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy, HH:mm"))) + snapshot.getTimestamp().format(DateTimeFormatter + .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT))) .ifPresent(viewer::sendMessage); // Show GUI diff --git a/common/src/main/java/net/william278/husksync/util/DataSnapshotList.java b/common/src/main/java/net/william278/husksync/util/DataSnapshotList.java index b29bbb94..63faeed0 100644 --- a/common/src/main/java/net/william278/husksync/util/DataSnapshotList.java +++ b/common/src/main/java/net/william278/husksync/util/DataSnapshotList.java @@ -27,6 +27,7 @@ import net.william278.paginedown.PaginatedList; import org.jetbrains.annotations.NotNull; import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -53,9 +54,9 @@ public class DataSnapshotList { snapshot.getShortId(), snapshot.isPinned() ? "※" : " ", snapshot.getTimestamp().format(DateTimeFormatter - .ofPattern("dd/MM/yyyy, HH:mm")), + .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT)), snapshot.getTimestamp().format(DateTimeFormatter - .ofPattern("MMM dd yyyy, HH:mm:ss.SSS")), + .ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.LONG)), snapshot.getSaveCause().getLocale(plugin), String.format("%.2fKiB", snapshot.getFileSize(plugin) / 1024f)) .orElse("• " + snapshot.getId())).toList(), diff --git a/common/src/main/java/net/william278/husksync/util/DataSnapshotOverview.java b/common/src/main/java/net/william278/husksync/util/DataSnapshotOverview.java index 5e179bd5..ec802d22 100644 --- a/common/src/main/java/net/william278/husksync/util/DataSnapshotOverview.java +++ b/common/src/main/java/net/william278/husksync/util/DataSnapshotOverview.java @@ -28,6 +28,7 @@ import net.william278.husksync.user.User; import org.jetbrains.annotations.NotNull; import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.List; import java.util.Locale; import java.util.Optional; @@ -61,7 +62,8 @@ public class DataSnapshotOverview { dataOwner.getUsername(), dataOwner.getUuid().toString()) .ifPresent(user::sendMessage); locales.getLocale("data_manager_timestamp", - snapshot.getTimestamp().format(DateTimeFormatter.ofPattern("MMM dd yyyy, HH:mm:ss.SSS")), + snapshot.getTimestamp().format(DateTimeFormatter + .ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.LONG)), snapshot.getTimestamp().toString()) .ifPresent(user::sendMessage); if (snapshot.isPinned()) {