From e5cfc2892b6db3bf2e07de93833f264412cc5d8e Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 11 Feb 2016 19:22:27 +0100
Subject: [PATCH] Fix replacement strings

---
 .../gui/main/offer/offerbook/OfferBookView.java   |  4 ++--
 .../pendingtrades/steps/buyer/BuyerStep3View.java |  6 ++----
 .../steps/seller/SellerStep2View.java             |  7 ++-----
 .../steps/seller/SellerStep3View.java             | 15 ++++++---------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
index e51d21f1de..32a989ad0f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
@@ -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)) {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java
index 2172029ea2..fd223dff94 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java
@@ -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.";
     }
 
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java
index 4b464a3c2c..7f6fe2b31d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java
@@ -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.";
     }
 
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
index c7df7b4807..d02abeac4c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
@@ -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.";
         }
     }