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

Fix replacement strings

Browse Source
This commit is contained in:
Manfred Karrer 2016-02-11 19:22:27 +01:00
parent abdfb30e57
commit e5cfc2892b
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
View File

@ -161,7 +161,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
paymentMethodComboBox.setOnAction(e -> model.onSetPaymentMethod(paymentMethodComboBox.getSelectionModel().getSelectedItem()));
createOfferButton.setOnAction(e -> onCreateOffer());
volumeColumn.textProperty().bind(createStringBinding(
() -> BSResources.get("Amount in {0} (Min.)", model.tradeCurrencyCode.get()), model.tradeCurrencyCode));
() -> "Amount in " + model.tradeCurrencyCode.get() + " (Min.)", model.tradeCurrencyCode));
model.getOfferList().comparatorProperty().bind(tableView.comparatorProperty());
@ -464,7 +464,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
hasSameProtocolVersion));
}
}
String title;
if (isTradable) {
if (model.isMyOffer(offer)) {

6
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java
View File

@ -19,7 +19,6 @@ package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer;
import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView;
import io.bitsquare.locale.BSResources;
public class BuyerStep3View extends TradeStepView {
@ -43,9 +42,8 @@ public class BuyerStep3View extends TradeStepView {
@Override
protected String getInfoText() {
return BSResources.get("Waiting for the bitcoin seller's confirmation " +
"for the receipt of the {0} payment.",
model.getCurrencyCode());
return "Waiting for the bitcoin seller's confirmation " +
"for the receipt of the " + model.getCurrencyCode() + " payment.";
}

7
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java
View File

@ -19,7 +19,6 @@ package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller;
import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView;
import io.bitsquare.locale.BSResources;
public class SellerStep2View extends TradeStepView {
@ -43,10 +42,8 @@ public class SellerStep2View extends TradeStepView {
@Override
protected String getInfoText() {
return BSResources.get(
"The deposit transaction has at least one blockchain confirmation.\n" +
"You need to wait until that the bitcoin buyer starts the {0} payment.",
model.getCurrencyCode());
return "The deposit transaction has at least one blockchain confirmation.\n" +
"You need to wait until that the bitcoin buyer starts the \" + model.getCurrencyCode() + \" payment.";
}

15
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View File

@ -21,7 +21,6 @@ import io.bitsquare.app.BitsquareApp;
import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView;
import io.bitsquare.gui.popups.Popup;
import io.bitsquare.locale.BSResources;
import io.bitsquare.user.PopupId;
import io.bitsquare.user.Preferences;
import javafx.geometry.HPos;
@ -103,15 +102,13 @@ public class SellerStep3View extends TradeStepView {
@Override
protected String getInfoText() {
if (model.isBlockChainMethod()) {
return BSResources.get("The bitcoin buyer has started the {0} payment.\n" +
"Check for blockchain confirmations at your Altcoin wallet or block explorer and " +
"confirm the payment when you have sufficient blockchain confirmations.",
model.getCurrencyCode());
return "The bitcoin buyer has started the " + model.getCurrencyCode() + " payment.\n" +
"Check for blockchain confirmations at your Altcoin wallet or block explorer and " +
"confirm the payment when you have sufficient blockchain confirmations.";
} else {
return BSResources.get("The bitcoin buyer has started the {0} payment.\n" +
"Check at your payment account (e.g. bank account) and confirm when you have " +
"received the payment.",
model.getCurrencyCode());
return "The bitcoin buyer has started the " + model.getCurrencyCode() + " payment.\n" +
"Check at your payment account (e.g. bank account) and confirm when you have " +
"received the payment.";
}
}