mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixes https://github.com/bisq-network/bisq/issues/2267

Browse source
This commit is contained in:
Manfred Karrer 2019-01-29 21:53:32 +01:00
parent 1e6777bb09
commit 5316c871c5
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/src/main/java/bisq/core/util/BsqFormatter.java
View file

@ -20,6 +20,7 @@ package bisq.core.util;
import bisq.core.app.BisqEnvironment; import bisq.core.app.BisqEnvironment;
import bisq.core.dao.exceptions.ValidationException; import bisq.core.dao.exceptions.ValidationException;
import bisq.core.dao.governance.param.Param; import bisq.core.dao.governance.param.Param;
import bisq.core.locale.GlobalSettings;
import bisq.core.locale.Res; import bisq.core.locale.Res;
import bisq.core.provider.price.MarketPrice; import bisq.core.provider.price.MarketPrice;
import bisq.core.util.validation.BtcAddressValidator; import bisq.core.util.validation.BtcAddressValidator;
@ -36,6 +37,9 @@ import org.bitcoinj.utils.MonetaryFormat;
import javax.inject.Inject; import javax.inject.Inject;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.Locale;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -44,14 +48,17 @@ public class BsqFormatter extends BSFormatter {
@SuppressWarnings("PointlessBooleanExpression") @SuppressWarnings("PointlessBooleanExpression")
private static final boolean useBsqAddressFormat = true || !DevEnv.isDevMode(); private static final boolean useBsqAddressFormat = true || !DevEnv.isDevMode();
private final String prefix = "B"; private final String prefix = "B";
private final DecimalFormat amountFormat = new DecimalFormat("###,###,###.##"); private DecimalFormat amountFormat;
private final DecimalFormat marketCapFormat = new DecimalFormat("###,###,###"); private DecimalFormat marketCapFormat;
private final MonetaryFormat btcCoinFormat; private final MonetaryFormat btcCoinFormat;
@Inject @Inject
public BsqFormatter() { public BsqFormatter() {
super(); super();
GlobalSettings.localeProperty().addListener((observable, oldValue, newValue) -> setFormatter(newValue));
setFormatter(GlobalSettings.getLocale());
btcCoinFormat = super.coinFormat; btcCoinFormat = super.coinFormat;
final String baseCurrencyCode = BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode(); final String baseCurrencyCode = BisqEnvironment.getBaseCurrencyNetwork().getCurrencyCode();
@ -73,6 +80,16 @@ public class BsqFormatter extends BSFormatter {
amountFormat.setMinimumFractionDigits(2); amountFormat.setMinimumFractionDigits(2);
} }
private void setFormatter(Locale locale) {
amountFormat = (DecimalFormat) NumberFormat.getNumberInstance(locale);
amountFormat.setMinimumFractionDigits(2);
amountFormat.setMaximumFractionDigits(2);
marketCapFormat = (DecimalFormat) NumberFormat.getNumberInstance(locale);
marketCapFormat = new DecimalFormat();
marketCapFormat.setMaximumFractionDigits(0);
}
/** /**
* Returns the base-58 encoded String representation of this * Returns the base-58 encoded String representation of this
* object, including version and checksum bytes. * object, including version and checksum bytes.