Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-28 12:07:35 +01:00
Code Issues Projects Releases Wiki Activity

Added timezone usage to FormatUtils #551

Browse Source
This commit is contained in:
Rsl1122 2018-04-01 14:21:49 +03:00
parent 024a0ab62e
commit 6424fe4a28
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
View File

@ -11,6 +11,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone;
/** /**
* @author Rsl1122 * @author Rsl1122
@ -70,9 +71,12 @@ public class FormatUtils {
} }
private static String format(long epochMs, String format) { private static String format(long epochMs, String format) {
boolean useServerTime = Settings.USE_SERVER_TIME.isTrue();
String locale = Settings.LOCALE.toString(); String locale = Settings.LOCALE.toString();
Locale usedLocale = locale.equalsIgnoreCase("default") ? Locale.ENGLISH : Locale.forLanguageTag(locale); Locale usedLocale = locale.equalsIgnoreCase("default") ? Locale.ENGLISH : Locale.forLanguageTag(locale);
SimpleDateFormat dateFormat = new SimpleDateFormat(format, usedLocale); SimpleDateFormat dateFormat = new SimpleDateFormat(format, usedLocale);
TimeZone timeZone = useServerTime ? TimeZone.getDefault() : TimeZone.getTimeZone("GMT");
dateFormat.setTimeZone(timeZone);
return dateFormat.format(epochMs); return dateFormat.format(epochMs);
} }