From 97532fdce6d4992ef00c641a5747d68ead883c38 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sun, 29 Jul 2018 15:18:54 -0400 Subject: [PATCH] Print UI dates in current time zone. --- .../main/java/com/lyndir/masterpassword/gui/util/Res.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java index c29896e1..4b8496cc 100644 --- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java +++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Res.java @@ -31,12 +31,10 @@ import java.io.IOException; import java.lang.ref.SoftReference; import java.util.Map; import java.util.concurrent.*; -import javax.annotation.Nullable; import javax.swing.*; import org.jetbrains.annotations.NonNls; -import org.joda.time.ReadableInstant; +import org.joda.time.*; import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; /** @@ -107,7 +105,7 @@ public abstract class Res { } public static String format(final ReadableInstant instant) { - return DateTimeFormat.mediumDateTime().print( instant ); + return DateTimeFormat.mediumDateTime().print( new DateTime( instant, DateTimeZone.getDefault() ) ); } public static final class Icons {