From 7cc4a286b8ce4ed0c8306fd16a6f4e0abb909402 Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Wed, 7 Mar 2018 13:17:19 +0100
Subject: [PATCH] Change wording from distance to below/above

---
 common/src/main/resources/i18n/displayStrings.properties   | 2 ++
 .../src/main/resources/i18n/displayStrings_de.properties   | 2 ++
 .../bisq/gui/main/offer/createoffer/CreateOfferView.java   | 7 +++++--
 .../io/bisq/gui/main/offer/takeoffer/TakeOfferView.java    | 7 +++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/src/main/resources/i18n/displayStrings.properties b/common/src/main/resources/i18n/displayStrings.properties
index 7a1c8c0a65..784cf5ae50 100644
--- a/common/src/main/resources/i18n/displayStrings.properties
+++ b/common/src/main/resources/i18n/displayStrings.properties
@@ -100,6 +100,8 @@ shared.fundFromSavingsWalletButton=Transfer funds from Bisq wallet
 shared.fundFromExternalWalletButton=Open your external wallet for funding
 shared.openDefaultWalletFailed=Opening a default bitcoin wallet application has failed. Perhaps you don't have one installed?
 shared.distanceInPercent=Distance in % from market price
+shared.belowInPercent=Below % from market price
+shared.aboveInPercent=Above % from market price
 shared.enterPercentageValue=Enter % value
 shared.OR=OR
 shared.notEnoughFunds=You don''t have enough funds in your Bisq wallet.\nYou need {0} but you have only {1} in your Bisq wallet.\n\nPlease fund that trade from an external Bitcoin wallet or fund your Bisq wallet at \"Funds/Receive funds\".
diff --git a/common/src/main/resources/i18n/displayStrings_de.properties b/common/src/main/resources/i18n/displayStrings_de.properties
index ba344365db..2895163213 100644
--- a/common/src/main/resources/i18n/displayStrings_de.properties
+++ b/common/src/main/resources/i18n/displayStrings_de.properties
@@ -97,6 +97,8 @@ shared.fundFromSavingsWalletButton=Gelder aus Bisq-Wallet überweisen
 shared.fundFromExternalWalletButton=Ihre externe Wallet zum Finanzieren öffnen
 shared.openDefaultWalletFailed=Das Öffnen einer Bitcoin-Wallet-Standardanwendung schlug fehl. Haben Sie möglicherweise keine installiert?
 shared.distanceInPercent=Abstand vom Marktpreis in %
+shared.belowInPercent=Unter dem Marktpreis in %
+shared.aboveInPercent=Über dem Marktpreis in %
 shared.enterPercentageValue=%-Wert eingeben
 shared.OR=ODER
 shared.notEnoughFunds=Sie haben nicht genug Gelder in Ihrer Bisq-Wallet.\nSie benötigen {0}, haben aber nur {1} in Ihrer Bisq-Wallet.\n\nFinanzieren Sie diesen Handel bitte von einer externen Bitcoin-Wallet oder finanzieren Sie Ihre Bisq-Wallet unter \"Gelder/Gelder erhalten\".
diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
index f75fe93d31..f97515e4a4 100644
--- a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
+++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
@@ -107,7 +107,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
     private Label directionLabel, amountDescriptionLabel, addressLabel, balanceLabel, totalToPayLabel,
             priceCurrencyLabel, volumeCurrencyLabel, priceDescriptionLabel,
             volumeDescriptionLabel, currencyTextFieldLabel, buyerSecurityDepositLabel, currencyComboBoxLabel,
-            waitingForFundsLabel, marketBasedPriceLabel, xLabel;
+            waitingForFundsLabel, marketBasedPriceLabel, xLabel, percentagePriceDescription;
     private ComboBox<PaymentAccount> paymentAccountsComboBox;
     private ComboBox<TradeCurrency> currencyComboBox;
     private ImageView imageView, qrCodeImageView;
@@ -247,11 +247,13 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
             placeOfferButton.setId("buy-button-big");
             placeOfferButton.setText(Res.get("createOffer.placeOfferButton", Res.get("shared.buy")));
             nextButton.setId("buy-button");
+            percentagePriceDescription.setText(Res.get("shared.belowInPercent"));
         } else {
             imageView.setId("image-sell-large");
             placeOfferButton.setId("sell-button-big");
             placeOfferButton.setText(Res.get("createOffer.placeOfferButton", Res.get("shared.sell")));
             nextButton.setId("sell-button");
+            percentagePriceDescription.setText(Res.get("shared.aboveInPercent"));
         }
 
         updateMarketPriceAvailable();
@@ -1043,7 +1045,8 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         editOfferElements.add(marketBasedPriceLabel);
         Tuple2<Label, VBox> priceAsPercentageInputBoxTuple = getTradeInputBox(priceAsPercentageValueCurrencyBox,
                 Res.get("shared.distanceInPercent"));
-        priceAsPercentageInputBoxTuple.first.setPrefWidth(200);
+        percentagePriceDescription = priceAsPercentageInputBoxTuple.first;
+        percentagePriceDescription.setPrefWidth(200);
         percentagePriceBox = priceAsPercentageInputBoxTuple.second;
 
         // Fixed/Percentage toggle
diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
index 3967f0ea77..5d9a89c5a7 100644
--- a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
+++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
@@ -90,7 +90,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
             paymentAccountsLabel, paymentMethodLabel,
             priceCurrencyLabel, priceAsPercentageLabel,
             volumeCurrencyLabel, priceDescriptionLabel, volumeDescriptionLabel,
-            waitingForFundsLabel, offerAvailabilityLabel, amountCurrency;
+            waitingForFundsLabel, offerAvailabilityLabel, amountCurrency, priceAsPercentageDescription;
     private InputTextField amountTextField;
     private TextField paymentMethodTextField, currencyTextField, priceTextField, priceAsPercentageTextField,
             volumeTextField, amountRangeTextField;
@@ -245,6 +245,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
             takeOfferButton.setId("buy-button-big");
             takeOfferButton.setText(Res.get("takeOffer.takeOfferButton", Res.get("shared.buy")));
             nextButton.setId("buy-button");
+            priceAsPercentageDescription.setText(Res.get("shared.aboveInPercent"));
         } else {
             imageView.setId("image-sell-large");
             directionLabel.setId("direction-icon-label-sell");
@@ -252,6 +253,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
             takeOfferButton.setId("sell-button-big");
             nextButton.setId("sell-button");
             takeOfferButton.setText(Res.get("takeOffer.takeOfferButton", Res.get("shared.sell")));
+            priceAsPercentageDescription.setText(Res.get("shared.belowInPercent"));
         }
 
         boolean showComboBox = model.getPossiblePaymentAccounts().size() > 1;
@@ -935,7 +937,8 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
 
         Tuple2<Label, VBox> priceAsPercentageInputBoxTuple = getTradeInputBox(priceAsPercentageValueCurrencyBox,
                 Res.get("shared.distanceInPercent"));
-        priceAsPercentageInputBoxTuple.first.setPrefWidth(220);
+        priceAsPercentageDescription = priceAsPercentageInputBoxTuple.first;
+        priceAsPercentageDescription.setPrefWidth(220);
         priceAsPercentageInputBox = priceAsPercentageInputBoxTuple.second;
 
         priceAsPercentageLabel.setText("%");