Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use environment locale to select right locale and currency #1313

Merged
merged 1 commit into from
Feb 13, 2018
Merged

Use environment locale to select right locale and currency #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/src/main/java/io/bisq/common/GlobalSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions gui/src/main/java/io/bisq/gui/app/BisqAppMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down