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

Merge pull request #1432 from ripcurlx/use-specific-wording-for-distance

Browse source 
Change wording from distance to below/above
This commit is contained in:
Manfred Karrer 2018-03-07 17:50:10 -05:00 • committed by GitHub
commit 1ebbd87ea3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/resources/i18n/displayStrings.properties
View file

@ -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\".

2
common/src/main/resources/i18n/displayStrings_de.properties
View file

@ -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\".

7
gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
View file

@ -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

7
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
View file

@ -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("%");