mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into DAO-improvements

Browse Source
This commit is contained in:
Manfred Karrer 2018-10-04 10:40:42 -05:00
commit 1b8863652c
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
16 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@
Bisq is a safe, private and decentralized way to exchange bitcoin for national currencies and other cryptocurrencies. Bisq uses peer-to-peer technology and multi-signature escrow to facilitate trading without the need for a centralized third party exchange. Bisq is non-custodial (never holds your funds), and incorporates a human arbitration system to resolve disputes.
For more information, see https://bisq-network/intro and for step-by-step getting started instructions, see https://bisq.network/get-started.
For more information, see https://bisq.network/intro and for step-by-step getting started instructions, see https://bisq.network/get-started.
## Building Bisq

1
core/src/main/resources/i18n/displayStrings.properties
View File

@ -2089,6 +2089,7 @@ payment.emailOrMobile=Email or mobile nr:
payment.useCustomAccountName=Use custom account name
payment.maxPeriod=Max. allowed trade period:
payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. trade limit: {1} / Account age: {2}
payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1}
payment.currencyWithSymbol=Currency: {0}
payment.nameOfAcceptedBank=Name of accepted bank
payment.addAcceptedBank=Add accepted bank

1
core/src/main/resources/i18n/displayStrings_de.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=E-Mail oder Mobil:
payment.useCustomAccountName=Spezifischen Kontonamen nutzen
payment.maxPeriod=Max. erlaubte Handelsdauer:
payment.maxPeriodAndLimit=Max. Handelsdauer: {0} / Max. Handelsgrenze: {1} / Konto-Alter: {2}
payment.maxPeriodAndLimitCrypto=Max. Handelsdauer: {0} / Max. Handelsgrenze: {1}
payment.currencyWithSymbol=Währung: {0}
payment.nameOfAcceptedBank=Name der akzeptierten Bank
payment.addAcceptedBank=Akzeptierte Bank hinzufügen

1
core/src/main/resources/i18n/displayStrings_el.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=Email ή αριθμός κινητού:
payment.useCustomAccountName=Χρήση προεπιλεγμένου ονόματος λογαριασμού
payment.maxPeriod=Μέγιστη επιτρεπόμενη χρονική περίοδος συναλλαγής:
payment.maxPeriodAndLimit=Μέγιστη διάρκεια συναλλαγής: {0} / Μέγιστο όριο συναλλαγής: {1} / Ηλικία λογαριασμού: {2}
payment.maxPeriodAndLimitCrypto=Μέγιστη διάρκεια συναλλαγής: {0} / Μέγιστο όριο συναλλαγής: {1}
payment.currencyWithSymbol=Νόμισμα: {0}
payment.nameOfAcceptedBank=Όνομα αποδεκτής τράπεζας
payment.addAcceptedBank=Εισαγωγή αποδεκτής τράπεζας

3
core/src/main/resources/i18n/displayStrings_es.properties
View File

@ -1871,7 +1871,8 @@ payment.accountNr=Número de cuenta:
payment.emailOrMobile=Email o número de móvil:
payment.useCustomAccountName=Utilizar nombre de cuenta personalizado
payment.maxPeriod=Periodo máximo de intercambio:
payment.maxPeriodAndLimit=Duración máxima de intercambio: {0} / Límite máximo de intercambio: {1}
payment.maxPeriodAndLimit=Duración máxima de intercambio: {0} / Límite máximo de intercambio: {1}
payment.maxPeriodAndLimitCrypto=Duración máxima de intercambio: {0} / Límite máximo de intercambio: {1}
payment.currencyWithSymbol=Moneda: {0}
payment.nameOfAcceptedBank=Nombre de banco aceptado
payment.addAcceptedBank=Añadir banco aceptado

1
core/src/main/resources/i18n/displayStrings_fa.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=ایمیل یا شماره موبایل:
payment.useCustomAccountName=استفاده از نام حساب سفارشی
payment.maxPeriod=حداکثر دوره ی زمانی مجاز معامله:
payment.maxPeriodAndLimit=حداکثر طول مدت معامله: {0} / حداکثر حد معامله: {1} / عمر حساب: {2}
payment.maxPeriodAndLimitCrypto=حداکثر طول مدت معامله: {0} / حداکثر حد معامله: {1}
payment.currencyWithSymbol=ارز: {0}
payment.nameOfAcceptedBank=نام بانک پذیرفته شده
payment.addAcceptedBank=افزودن بانک پذیرفته شده

1
core/src/main/resources/i18n/displayStrings_fr.properties
View File

@ -1596,6 +1596,7 @@ payment.emailOrMobile=Email ou numéro de mobile:
payment.useCustomAccountName=Utiliser un nom de compte personnalisé
payment.maxPeriod=Max. allowed trade period:
payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. trade limit: {1} / Account age: {2}
payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1}
payment.currencyWithSymbol=Devise:{0}
payment.nameOfAcceptedBank=Nom de la banque acceptée
payment.addAcceptedBank=Ajouter une banque acceptée

1
core/src/main/resources/i18n/displayStrings_hu.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=E-mail vagy mobil:
payment.useCustomAccountName=Használj egyéni fióknevet
payment.maxPeriod=Max. megengedett tranzakció időszak:
payment.maxPeriodAndLimit=Max. tranzakció időtartama: {0} / Max. tranzakció korlátozás: {1} / Fiók kora: {2}
payment.maxPeriodAndLimitCrypto=Max. tranzakció időtartama: {0} / Max. tranzakció korlátozás: {1}
payment.currencyWithSymbol=Valuta: {0}
payment.nameOfAcceptedBank=Elfogadott bank neve
payment.addAcceptedBank=Hozzáad elfogadott bankot

1
core/src/main/resources/i18n/displayStrings_pt.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=Email ou celular:
payment.useCustomAccountName=Usar número de conta personalizado:
payment.maxPeriod=Max. allowed trade period:
payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. trade limit: {1} / Account age: {2}
payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1}
payment.currencyWithSymbol=Moeda: {0}
payment.nameOfAcceptedBank=Nome do banco aceito
payment.addAcceptedBank=Adicionar banco aceito

1
core/src/main/resources/i18n/displayStrings_ro.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=E-mail sau nr. mobil:
payment.useCustomAccountName=Folosește nume de cont preferințial
payment.maxPeriod=Perioada maximă de tranzacționare permisă:
payment.maxPeriodAndLimit=Durata maximă de tranzacționare: {0} / Limita maximă de tranzacționare: {1} / Vechimea contului: {2}
payment.maxPeriodAndLimitCrypto=Durata maximă de tranzacționare: {0} / Limita maximă de tranzacționare: {1}
payment.currencyWithSymbol=Valuta: {0}
payment.nameOfAcceptedBank=Numele băncii acceptate
payment.addAcceptedBank=Adaugă bancă acceptată

1
core/src/main/resources/i18n/displayStrings_ru.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=Э-почта или мобильный номер:
payment.useCustomAccountName=Использовать своё название счёта
payment.maxPeriod=Макс. допустимый срок сделки:
payment.maxPeriodAndLimit=Макс. продолжительность сделки: {0} / Макс. торговый предел: {1} / Срок существования счёта: {2}
payment.maxPeriodAndLimitCrypto=Макс. продолжительность сделки: {0} / Макс. торговый предел: {1}
payment.currencyWithSymbol=Валюта: {0}
payment.nameOfAcceptedBank=Название приемлемого банка
payment.addAcceptedBank=Добавить приемлемый банк

1
core/src/main/resources/i18n/displayStrings_sr.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=Email ili br. mobilnog:
payment.useCustomAccountName=Koristi prilagođeno ime računa
payment.maxPeriod=Maks. dozvoljeni period trgovine:
payment.maxPeriodAndLimit=Maks. trajanje trgovine: {0} / Maks. rok trgovine: {1}
payment.maxPeriodAndLimitCrypto=Maks. trajanje trgovine: {0} / Maks. rok trgovine: {1}
payment.currencyWithSymbol=Valuta: {0}
payment.nameOfAcceptedBank=Ime prihvaćene banke
payment.addAcceptedBank=Dodaj prihvaćenu banke

1
core/src/main/resources/i18n/displayStrings_th.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=หมายเลขโทรศัพท์มือถ
payment.useCustomAccountName=ใช้ชื่อบัญชีที่กำหนดเอง
payment.maxPeriod=ระยะเวลาสูงสุดการค้าที่อนุญาต:
payment.maxPeriodAndLimit=ระยะเวลาสูงสุดทางการค้า: {0} / ขีดจำกัดสูงสุดทางการค้า: {1} / อายุบัญชี: {2}
payment.maxPeriodAndLimitCrypto=ระยะเวลาสูงสุดทางการค้า: {0} / ขีดจำกัดสูงสุดทางการค้า: {1}
payment.currencyWithSymbol=สกุลเงิน: {0}
payment.nameOfAcceptedBank=ชื่อธนาคารที่ได้รับการยอมรับ
payment.addAcceptedBank=เพิ่มธนาคารที่ยอมรับ

1
core/src/main/resources/i18n/displayStrings_vi.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=Email hoặc số điện thoại:
payment.useCustomAccountName=Sử dụng tên tài khoản thông dụng
payment.maxPeriod=Thời gian giao dịch cho phép tối đa:
payment.maxPeriodAndLimit=Thời gian giao dịch tối đa: {0} / Giới hạn giao dịch tối đa: {1} / Tuổi tài khoản: {2}
payment.maxPeriodAndLimitCrypto=Thời gian giao dịch tối đa: {0} / Giới hạn giao dịch tối đa: {1}
payment.currencyWithSymbol=Tiền tệ: {0}
payment.nameOfAcceptedBank=Tên NH được chấp nhận
payment.addAcceptedBank=Thêm NH được chấp nhận

1
core/src/main/resources/i18n/displayStrings_zh.properties
View File

@ -1872,6 +1872,7 @@ payment.emailOrMobile=电子邮箱或手机号码:
payment.useCustomAccountName=使用自定义名称
payment.maxPeriod=最大允许时限:
payment.maxPeriodAndLimit=最大交易期限：{0} /最大交易限额：{1}
payment.maxPeriodAndLimitCrypto=最大交易期限：{0} /最大交易限额：{1}
payment.currencyWithSymbol=货币:{0}
payment.nameOfAcceptedBank=接受的银行名称
payment.addAcceptedBank=添加接受的银行

16
desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
View File

@ -156,12 +156,20 @@ public abstract class PaymentMethodForm {
CurrencyUtil.getAllSortedCryptoCurrencies().get(0) :
CurrencyUtil.getDefaultTradeCurrency();
final boolean isAddAccountScreen = paymentAccount.getAccountName() == null;
final long accountAge = !isAddAccountScreen ? accountAgeWitnessService.getMyAccountAge(paymentAccount.getPaymentAccountPayload()) : 0L;
addLabelTextField(gridPane, ++gridRow, Res.get("payment.limitations"), Res.get("payment.maxPeriodAndLimit",
getTimeText(hours),
formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit(paymentAccount, tradeCurrency.getCode()))),
formatter.formatAccountAge(accountAge)));
final String limitationsText = paymentAccount instanceof CryptoCurrencyAccount ?
Res.get("payment.maxPeriodAndLimitCrypto",
getTimeText(hours),
formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit(paymentAccount, tradeCurrency.getCode()))))
:
Res.get("payment.maxPeriodAndLimit",
getTimeText(hours),
formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit(paymentAccount, tradeCurrency.getCode()))),
formatter.formatAccountAge(accountAge));
addLabelTextField(gridPane, ++gridRow, Res.get("payment.limitations"), limitationsText);
if (isAddAccountScreen) {
InputTextField inputTextField = addLabelInputTextField(gridPane, ++gridRow, Res.get("payment.salt"), 0).second;