Merge pull request #1313 from blabno/feature/1204-use-environment-loc…

…ale-to-select-right-locale-and-currency Use environment locale to select right locale and currency
bisq-network · Feb 13, 2018 · 224a91b · 224a91b
2 parents ed0148b + 4b0692c
commit 224a91b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/common/src/main/java/io/bisq/common/GlobalSettings.java b/common/src/main/java/io/bisq/common/GlobalSettings.java
@@ -26,7 +26,7 @@
 
 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<Locale> 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
@@ -25,17 +25,12 @@
 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();
     }