From 4b0692c6e03d2bd6016c48dbbb1db9cb14d30d6e Mon Sep 17 00:00:00 2001 From: Bernard Labno Date: Thu, 1 Feb 2018 13:58:36 +0100 Subject: [PATCH] Use environment locale to select right locale and currency --- common/src/main/java/io/bisq/common/GlobalSettings.java | 2 +- gui/src/main/java/io/bisq/gui/app/BisqAppMain.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common/src/main/java/io/bisq/common/GlobalSettings.java b/common/src/main/java/io/bisq/common/GlobalSettings.java index 82b323b877..4847b8d743 100644 --- a/common/src/main/java/io/bisq/common/GlobalSettings.java +++ b/common/src/main/java/io/bisq/common/GlobalSettings.java @@ -26,7 +26,7 @@ import java.util.Locale; public class GlobalSettings { private static boolean useAnimations = true; - private static Locale locale = new Locale("en", "US"); + private static Locale locale = Locale.getDefault(); private static final ObjectProperty localeProperty = new SimpleObjectProperty<>(locale); private static TradeCurrency defaultTradeCurrency; private static String btcDenomination; diff --git a/gui/src/main/java/io/bisq/gui/app/BisqAppMain.java b/gui/src/main/java/io/bisq/gui/app/BisqAppMain.java index c2e2d9f116..bcfe401768 100644 --- a/gui/src/main/java/io/bisq/gui/app/BisqAppMain.java +++ b/gui/src/main/java/io/bisq/gui/app/BisqAppMain.java @@ -25,17 +25,12 @@ import joptsimple.OptionException; import joptsimple.OptionParser; import joptsimple.OptionSet; -import java.util.Locale; - import static io.bisq.core.app.BisqEnvironment.DEFAULT_APP_NAME; import static io.bisq.core.app.BisqEnvironment.DEFAULT_USER_DATA_DIR; public class BisqAppMain extends BisqExecutable { static { - // Need to set default locale initially otherwise we get problems at non-english OS - Locale.setDefault(new Locale("en", Locale.getDefault().getCountry())); - Utilities.removeCryptographyRestrictions(); }