Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 23:50:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

replace variations of btc with xmr in app resources

Browse source
This commit is contained in:
woodser 2023-10-09 15:52:55 -04:00
parent fe543e7c58
commit 222af4768b
62 changed files with 2077 additions and 2101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/src/main/java/haveno/desktop/main/MainViewModel.java
View file

@ -496,7 +496,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
private void showPopupIfInvalidBtcConfig() {
preferences.setMoneroNodesOptionOrdinal(0);
new Popup().warning(Res.get("settings.net.warn.invalidBtcConfig"))
new Popup().warning(Res.get("settings.net.warn.invalidXmrConfig"))
.hideCloseButton()
.useShutDownButton()
.show();

2
desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartView.java
View file

@ -543,7 +543,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
});
// amount
TableColumn<OfferListItem, OfferListItem> amountColumn = new AutoTooltipTableColumn<>(Res.get("shared.BTCMinMax"));
TableColumn<OfferListItem, OfferListItem> amountColumn = new AutoTooltipTableColumn<>(Res.get("shared.XMRMinMax"));
amountColumn.setMinWidth(115);
amountColumn.setSortable(false);
amountColumn.getStyleClass().add("number-column");

2
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
View file

@ -491,7 +491,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
private void applyMakerFee() {
tradeFeeCurrencyCode.set(Res.getBaseCurrencyCode());
tradeFeeDescription.set(Res.get("createOffer.tradeFee.descriptionBTCOnly"));
tradeFeeDescription.set(Res.get("createOffer.tradeFee.descriptionXMROnly"));
BigInteger makerFee = dataModel.getMakerFee();
if (makerFee == null) {

6
desktop/src/main/java/haveno/desktop/main/offer/OfferViewModelUtil.java
View file

@ -46,7 +46,7 @@ public class OfferViewModelUtil {
BigInteger tradeAmount,
CoinFormatter formatter,
BigInteger minTradeFee) {
String feeAsBtc = HavenoUtils.formatXmr(tradeFee, true);
String feeAsXmr = HavenoUtils.formatXmr(tradeFee, true);
String percentage;
if (tradeFee.compareTo(minTradeFee) <= 0) {
percentage = Res.get("guiUtil.requiredMinimum")
@ -59,7 +59,7 @@ public class OfferViewModelUtil {
return offerUtil.getFeeInUserFiatCurrency(tradeFee,
formatter)
.map(VolumeUtil::formatAverageVolumeWithCode)
.map(feeInFiat -> Res.get("feeOptionWindow.btcFeeWithFiatAndPercentage", feeAsBtc, feeInFiat, percentage))
.orElseGet(() -> Res.get("feeOptionWindow.btcFeeWithPercentage", feeAsBtc, percentage));
.map(feeInFiat -> Res.get("feeOptionWindow.xmrFeeWithFiatAndPercentage", feeAsXmr, feeInFiat, percentage))
.orElseGet(() -> Res.get("feeOptionWindow.xmrFeeWithPercentage", feeAsXmr, percentage));
}
}

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -763,7 +763,7 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
///////////////////////////////////////////////////////////////////////////////////////////
private AutoTooltipTableColumn<OfferBookListItem, OfferBookListItem> getAmountColumn() {
AutoTooltipTableColumn<OfferBookListItem, OfferBookListItem> column = new AutoTooltipTableColumn<>(Res.get("shared.BTCMinMax"), Res.get("shared.amountHelp"));
AutoTooltipTableColumn<OfferBookListItem, OfferBookListItem> column = new AutoTooltipTableColumn<>(Res.get("shared.XMRMinMax"), Res.get("shared.amountHelp"));
column.setMinWidth(100);
column.getStyleClass().add("number-column");
column.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));

2
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -623,7 +623,7 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
private static String getDirectionWithCodeDetailed(OfferDirection direction, String currencyCode) {
if (CurrencyUtil.isTraditionalCurrency(currencyCode))
return (direction == OfferDirection.BUY) ? Res.get("shared.buyingBTCWith", currencyCode) : Res.get("shared.sellingBTCFor", currencyCode);
return (direction == OfferDirection.BUY) ? Res.get("shared.buyingXMRWith", currencyCode) : Res.get("shared.sellingXMRFor", currencyCode);
else
return (direction == OfferDirection.SELL) ? Res.get("shared.buyingCurrency", currencyCode) : Res.get("shared.sellingCurrency", currencyCode);
}

2
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java
View file

@ -645,7 +645,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
showWarningInvalidBtcDecimalPlacesSubscription = EasyBind.subscribe(model.showWarningInvalidBtcDecimalPlaces, newValue -> {
if (newValue) {
new Popup().warning(Res.get("takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces")).show();
new Popup().warning(Res.get("takeOffer.amountPriceBox.warning.invalidXmrDecimalPlaces")).show();
model.showWarningInvalidBtcDecimalPlaces.set(false);
}
});

4
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -267,7 +267,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
}
private void applyTakerFee() {
tradeFeeDescription.set(Res.get("createOffer.tradeFee.descriptionBTCOnly"));
tradeFeeDescription.set(Res.get("createOffer.tradeFee.descriptionXMROnly"));
BigInteger takerFee = dataModel.getTakerFee();
if (takerFee == null) {
return;
@ -292,7 +292,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
amountValidationResult.set(result);
if (result.isValid) {
showWarningInvalidBtcDecimalPlaces.set(!DisplayUtils.hasBtcValidDecimals(userInput, xmrFormatter));
// only allow max 4 decimal places for btc values
// only allow max 4 decimal places for xmr values
setAmountToModel();
// reformat input
amount.set(HavenoUtils.formatXmr(dataModel.getAmount().get()));

2
desktop/src/main/java/haveno/desktop/main/overlays/windows/ContractWindow.java
View file

@ -162,7 +162,7 @@ public class ContractWindow extends Overlay<ContractWindow> {
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("shared.securityDeposit"), securityDeposit);
addConfirmationLabelTextField(gridPane,
++rowIndex,
Res.get("contractWindow.btcAddresses"),
Res.get("contractWindow.xmrAddresses"),
contract.getBuyerPayoutAddressString() + " / " + contract.getSellerPayoutAddressString());
addConfirmationLabelTextField(gridPane,
++rowIndex,

4
desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java
View file

@ -215,7 +215,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
addConfirmationLabelLabel(gridPane, rowIndex, offerTypeLabel,
DisplayUtils.getDirectionBothSides(direction), firstRowDistance);
}
String btcAmount = Res.get("shared.btcAmount");
String btcAmount = Res.get("shared.xmrAmount");
if (takeOfferHandlerOptional.isPresent()) {
addConfirmationLabelLabel(gridPane, ++rowIndex, btcAmount + xmrDirectionInfo,
HavenoUtils.formatXmr(tradeAmount, true));
@ -224,7 +224,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
} else {
addConfirmationLabelLabel(gridPane, ++rowIndex, btcAmount + xmrDirectionInfo,
HavenoUtils.formatXmr(offer.getAmount(), true));
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("offerDetailsWindow.minBtcAmount"),
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("offerDetailsWindow.minXmrAmount"),
HavenoUtils.formatXmr(offer.getMinAmount(), true));
String volume = VolumeUtil.formatVolumeWithCode(offer.getVolume());
String minVolume = "";

2
desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -155,7 +155,7 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
xmrDirectionInfo = toSpend;
}
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("shared.btcAmount") + xmrDirectionInfo,
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("shared.xmrAmount") + xmrDirectionInfo,
HavenoUtils.formatXmr(trade.getAmount(), true));
addConfirmationLabelTextField(gridPane, ++rowIndex,
VolumeUtil.formatVolumeLabel(offer.getCurrencyCode()) + counterCurrencyDirectionInfo,

2
desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java
View file

@ -132,7 +132,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
priceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.price")));
deviationColumn.setGraphic(new AutoTooltipTableColumn<>(Res.get("shared.deviation"),
Res.get("portfolio.closedTrades.deviation.help")).getGraphic());
amountColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.BTCMinMax")));
amountColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.XMRMinMax")));
volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amountMinMax")));
marketColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.market")));
directionColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.offerType")));

2
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java
View file

@ -48,7 +48,7 @@ public class SellerStep1View extends TradeStepView {
@Override
protected String getInfoText() {
return Res.get("portfolio.pending.step1.info", Res.get("shared.TheBTCBuyer"));
return Res.get("portfolio.pending.step1.info", Res.get("shared.TheXMRBuyer"));
}
///////////////////////////////////////////////////////////////////////////////////////////

2
desktop/src/main/java/haveno/desktop/main/settings/about/AboutView.java
View file

@ -112,7 +112,7 @@ public class AboutView extends ActivatableView<GridPane, Void> {
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.walletDetails"),
Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "j"));
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.openEmergencyBtcWalletTool"),
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.openEmergencyXmrWalletTool"),
Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "e"));
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.showTorLogs"),

2
desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
View file

@ -153,7 +153,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
@Override
public void initialize() {
btcHeader.setText(Res.get("settings.net.btcHeader"));
btcHeader.setText(Res.get("settings.net.xmrHeader"));
p2pHeader.setText(Res.get("settings.net.p2pHeader"));
onionAddress.setPromptText(Res.get("settings.net.onionAddressLabel"));
xmrNodesLabel.setText(Res.get("settings.net.xmrNodesLabel"));