From 2a45ebe5658aa650f36510dcd28b927d58a33e16 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 6 Nov 2024 08:06:53 -0500
Subject: [PATCH] refactor buy/sell tab labels #1351
---
.../resources/i18n/displayStrings.properties | 4 +++-
.../i18n/displayStrings_cs.properties | 4 ++++
.../i18n/displayStrings_de.properties | 4 ++++
.../i18n/displayStrings_es.properties | 4 ++++
.../i18n/displayStrings_fa.properties | 4 ++++
.../i18n/displayStrings_fr.properties | 4 ++++
.../i18n/displayStrings_it.properties | 4 ++++
.../i18n/displayStrings_ja.properties | 4 ++++
.../i18n/displayStrings_pt-br.properties | 4 ++++
.../i18n/displayStrings_pt.properties | 4 ++++
.../i18n/displayStrings_ru.properties | 4 ++++
.../i18n/displayStrings_th.properties | 4 ++++
.../i18n/displayStrings_tr.properties | 5 ++++-
.../i18n/displayStrings_vi.properties | 4 ++++
.../i18n/displayStrings_zh-hans.properties | 4 ++++
.../i18n/displayStrings_zh-hant.properties | 4 ++++
.../src/main/java/haveno/desktop/haveno.css | 8 +++++++
.../desktop/main/offer/BuyOfferView.java | 7 ++++++
.../haveno/desktop/main/offer/OfferView.java | 21 ++++++++++++++----
.../desktop/main/offer/SellOfferView.java | 7 ++++++
.../main/offer/offerbook/OfferBookView.java | 22 +++----------------
21 files changed, 105 insertions(+), 25 deletions(-)
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index c0e99107a3..344998842b 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -376,6 +376,8 @@ offerbook.timeSinceSigning.tooltip.checkmark.buyXmr=buy XMR from a signed accoun
offerbook.timeSinceSigning.tooltip.checkmark.wait=wait a minimum of {0} days
offerbook.timeSinceSigning.tooltip.learnMore=Learn more
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=Buy XMR with:
+offerbook.sellXmrFor=Sell XMR for:
offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n\
{0} days later, the initial limit of {1} is lifted and your account can sign other peers'' payment accounts.
@@ -390,7 +392,7 @@ offerbook.volume={0} (min - max)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
-offerbook.createNewOffer=Create new offer to {0} {1}
+offerbook.createNewOffer=Create offer to {0} {1}
offerbook.createOfferDisabled.tooltip=You can only create one offer at a time
offerbook.takeOfferButton.tooltip=Take offer for {0}
diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties
index 18b25963c6..3cd127ac69 100644
--- a/core/src/main/resources/i18n/displayStrings_cs.properties
+++ b/core/src/main/resources/i18n/displayStrings_cs.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Potvrzuji
shared.openURL=Otevřené {0}
shared.fiat=Fiat
shared.crypto=Krypto
+shared.preciousMetals=Drahé kovy
shared.all=Vše
shared.edit=Upravit
shared.advancedOptions=Pokročilé možnosti
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=účet byl zablokován
offerbook.timeSinceSigning.daysSinceSigning={0} dní
offerbook.timeSinceSigning.daysSinceSigning.long={0} od podpisu
offerbook.xmrAutoConf=Je automatické potvrzení povoleno
+offerbook.buyXmrWith=Kupte XMR za:
+offerbook.sellXmrFor=Prodat XMR za:
offerbook.timeSinceSigning.help=Když úspěšně dokončíte obchod s uživatelem, který má podepsaný platební účet, je váš platební účet podepsán.\n{0} dní později se počáteční limit {1} zruší a váš účet může podepisovat platební účty ostatních uživatelů.
offerbook.timeSinceSigning.notSigned=Dosud nepodepsáno
@@ -362,6 +365,7 @@ offerbook.nrOffers=Počet nabídek: {0}
offerbook.volume={0} (min - max)
offerbook.deposit=Kauce XMR (%)
offerbook.deposit.help=Kauce zaplacená každým obchodníkem k zajištění obchodu. Bude vrácena po dokončení obchodu.
+offerbook.createNewOffer=Vytvořit nabídku pro {0} {1}
offerbook.createOfferToBuy=Vytvořit novou nabídku k nákupu {0}
offerbook.createOfferToSell=Vytvořit novou nabídku k prodeji {0}
diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties
index 3c32e2c38b..798445beee 100644
--- a/core/src/main/resources/i18n/displayStrings_de.properties
+++ b/core/src/main/resources/i18n/displayStrings_de.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Ich bestätige
shared.openURL=Öffne {0}
shared.fiat=Fiat
shared.crypto=Crypto
+shared.preciousMetals=Edelmetalle
shared.all=Alle
shared.edit=Bearbeiten
shared.advancedOptions=Erweiterte Optionen
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=Konto wurde geblockt
offerbook.timeSinceSigning.daysSinceSigning={0} Tage
offerbook.timeSinceSigning.daysSinceSigning.long={0} seit der Unterzeichnung
offerbook.xmrAutoConf=Automatische Bestätigung aktiviert
+offerbook.buyXmrWith=XMR kaufen mit:
+offerbook.sellXmrFor=XMR verkaufen für:
offerbook.timeSinceSigning.help=Wenn Sie einen Trade mit einem Partner erfolgreich abschließen, der ein unterzeichnetes Zahlungskonto hat, wird Ihr Zahlungskonto unterzeichnet.\n{0} Tage später wird das anfängliche Limit von {1} aufgehoben und Ihr Konto kann die Zahlungskonten anderer Partner unterzeichnen.
offerbook.timeSinceSigning.notSigned=Noch nicht unterzeichnet
@@ -362,6 +365,7 @@ offerbook.nrOffers=Anzahl der Angebote: {0}
offerbook.volume={0} (min - max)
offerbook.deposit=Kaution XMR (%)
offerbook.deposit.help=Kaution die von beiden Handelspartnern bezahlt werden muss, um den Handel abzusichern. Wird zurückgezahlt, wenn der Handel erfolgreich abgeschlossen wurde.
+offerbook.createNewOffer=Erstelle Angebot an {0} {1}
offerbook.createOfferToBuy=Neues Angebot erstellen, um {0} zu kaufen
offerbook.createOfferToSell=Neues Angebot erstellen, um {0} zu verkaufen
diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties
index fb1d4d0b8a..d123b9195e 100644
--- a/core/src/main/resources/i18n/displayStrings_es.properties
+++ b/core/src/main/resources/i18n/displayStrings_es.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Confirmo
shared.openURL=Abrir {0}
shared.fiat=Fiat
shared.crypto=Cripto
+shared.preciousMetals=Metales Preciosos
shared.all=Todos
shared.edit=Editar
shared.advancedOptions=Opciones avanzadas
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=La cuenta fue bloqueada
offerbook.timeSinceSigning.daysSinceSigning={0} días
offerbook.timeSinceSigning.daysSinceSigning.long={0} desde el firmado
offerbook.xmrAutoConf=¿Está habilitada la confirmación automática?
+offerbook.buyXmrWith=Compra XMR con:
+offerbook.sellXmrFor=Vender XMR por:
offerbook.timeSinceSigning.help=Cuando complete con éxito un intercambio con un par que tenga una cuenta de pago firmada, su cuenta de pago es firmada.\n{0} días después, el límite inicial de {1} se eleva y su cuenta puede firmar tras cuentas de pago.
offerbook.timeSinceSigning.notSigned=No firmada aún
@@ -362,6 +365,7 @@ offerbook.nrOffers=Número de ofertas: {0}
offerbook.volume={0} (min - max)
offerbook.deposit=Depósito en XMR (%)
offerbook.deposit.help=Depósito pagado por cada comerciante para garantizar el intercambio. Será devuelto al acabar el intercambio.
+offerbook.createNewOffer=Crear oferta a {0} {1}
offerbook.createOfferToBuy=Crear nueva oferta para comprar {0}
offerbook.createOfferToSell=Crear nueva oferta para vender {0}
diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties
index 53a2b2be29..ee23042153 100644
--- a/core/src/main/resources/i18n/displayStrings_fa.properties
+++ b/core/src/main/resources/i18n/displayStrings_fa.properties
@@ -192,6 +192,7 @@ shared.iConfirm=تایید میکنم
shared.openURL=باز {0}
shared.fiat=فیات
shared.crypto=کریپتو
+shared.preciousMetals=فلزات گرانبها
shared.all=همه
shared.edit=ویرایش
shared.advancedOptions=گزینههای پیشرفته
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=account was banned
offerbook.timeSinceSigning.daysSinceSigning={0} روز
offerbook.timeSinceSigning.daysSinceSigning.long={0} since signing
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=با XMR خرید کنید:
+offerbook.sellXmrFor=فروش XMR برای:
offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n{0} days later, the initial limit of {1} is lifted and your account can sign other peers'' payment accounts.
offerbook.timeSinceSigning.notSigned=Not signed yet
@@ -362,6 +365,7 @@ offerbook.nrOffers=تعداد پیشنهادها: {0}
offerbook.volume={0} (حداقل - حداکثر)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=پیشنهاد ایجاد کنید به {0} {1}
offerbook.createOfferToBuy=پیشنهاد جدید برای خرید {0} ایجاد کن
offerbook.createOfferToSell=پیشنهاد جدید برای فروش {0} ایجاد کن
diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties
index ec42105c9c..5130e608be 100644
--- a/core/src/main/resources/i18n/displayStrings_fr.properties
+++ b/core/src/main/resources/i18n/displayStrings_fr.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Je confirme
shared.openURL=Ouvert {0}
shared.fiat=Fiat
shared.crypto=Crypto
+shared.preciousMetals=Métaux précieux
shared.all=Tout
shared.edit=Modifier
shared.advancedOptions=Options avancées
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=Ce compte a été banni
offerbook.timeSinceSigning.daysSinceSigning={0} jours
offerbook.timeSinceSigning.daysSinceSigning.long={0} depuis la signature
offerbook.xmrAutoConf=Est-ce-que la confirmation automatique est activée
+offerbook.buyXmrWith=Acheter XMR avec :
+offerbook.sellXmrFor=Vendre XMR pour :
offerbook.timeSinceSigning.help=Lorsque vous effectuez avec succès une transaction avec un pair disposant d''un compte de paiement signé, votre compte de paiement est signé.\n{0} Jours plus tard, la limite initiale de {1} est levée et votre compte peut signer les comptes de paiement d''un autre pair.
offerbook.timeSinceSigning.notSigned=Pas encore signé
@@ -362,6 +365,7 @@ offerbook.nrOffers=Nombre d''ordres: {0}
offerbook.volume={0} (min - max)
offerbook.deposit=Déposer XMR (%)
offerbook.deposit.help=Les deux parties à la transaction ont payé un dépôt pour assurer que la transaction se déroule normalement. Ce montant sera remboursé une fois la transaction terminée.
+offerbook.createNewOffer=Créer une offre à {0} {1}
offerbook.createOfferToBuy=Créer un nouvel ordre d''achat pour {0}
offerbook.createOfferToSell=Créer un nouvel ordre de vente pour {0}
diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties
index d663400dd0..8b2027334b 100644
--- a/core/src/main/resources/i18n/displayStrings_it.properties
+++ b/core/src/main/resources/i18n/displayStrings_it.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Confermo
shared.openURL=Aperti {0}
shared.fiat=Fiat
shared.crypto=Crypto
+shared.preciousMetals=Metalli Preziosi
shared.all=Tutti
shared.edit=Modifica
shared.advancedOptions=Opzioni avanzate
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned= \nl'account è stato bannato
offerbook.timeSinceSigning.daysSinceSigning={0} giorni
offerbook.timeSinceSigning.daysSinceSigning.long={0} dalla firma
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=Compra XMR con:
+offerbook.sellXmrFor=Vendi XMR per:
offerbook.timeSinceSigning.help=Quando completi correttamente un'operazione con un peer che ha un account di pagamento firmato, il tuo account di pagamento viene firmato.\n{0} giorni dopo, il limite iniziale di {1} viene alzato e il tuo account può firmare account di pagamento di altri peer.
offerbook.timeSinceSigning.notSigned=Non ancora firmato
@@ -362,6 +365,7 @@ offerbook.nrOffers=N. di offerte: {0}
offerbook.volume={0} (min - max)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=Crea offerta per {0} {1}
offerbook.createOfferToBuy=Crea una nuova offerta per comprare {0}
offerbook.createOfferToSell=Crea una nuova offerta per vendere {0}
diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties
index 372906c2a3..76174c73df 100644
--- a/core/src/main/resources/i18n/displayStrings_ja.properties
+++ b/core/src/main/resources/i18n/displayStrings_ja.properties
@@ -192,6 +192,7 @@ shared.iConfirm=確認します
shared.openURL={0} をオープン
shared.fiat=法定通貨
shared.crypto=暗号通貨
+shared.preciousMetals=貴金属
shared.all=全て
shared.edit=編集
shared.advancedOptions=高度なオプション
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=このアカウントは禁止されま
offerbook.timeSinceSigning.daysSinceSigning={0}日
offerbook.timeSinceSigning.daysSinceSigning.long=署名する後から {0}
offerbook.xmrAutoConf=自動確認は有効されますか？
+offerbook.buyXmrWith=XMRを購入:
+offerbook.sellXmrFor=XMRを売る:
offerbook.timeSinceSigning.help=署名された支払いアカウントを持っているピアと成功にトレードすると、自身の支払いアカウントも署名されることになります。\n{0} 日後に、{1} という初期の制限は解除され、他のピアの支払いアカウントを署名できるようになります。
offerbook.timeSinceSigning.notSigned=まだ署名されていません
@@ -362,6 +365,7 @@ offerbook.nrOffers=オファー数: {0}
offerbook.volume={0} (下限 - 上限)
offerbook.deposit=XMRの敷金(%)
offerbook.deposit.help=トレードを保証するため、両方の取引者が支払う敷金。トレードが完了されたら、返還されます。
+offerbook.createNewOffer={0} {1}にオファーを作成する
offerbook.createOfferToBuy={0} を購入するオファーを作成
offerbook.createOfferToSell={0} を売却するオファーを作成
diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties
index b521753fea..7dc51d9ac0 100644
--- a/core/src/main/resources/i18n/displayStrings_pt-br.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Eu confirmo
shared.openURL=Aberto {0}
shared.fiat=Fiat
shared.crypto=Cripto
+shared.preciousMetals=Metais Preciosos
shared.all=Todos
shared.edit=Editar
shared.advancedOptions=Opções avançadas
@@ -351,6 +352,8 @@ offerbook.timeSinceSigning.info.banned=conta foi banida
offerbook.timeSinceSigning.daysSinceSigning={0} dias
offerbook.timeSinceSigning.daysSinceSigning.long={0} desde a assinatura
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=Compre XMR com:
+offerbook.sellXmrFor=Venda XMR por:
offerbook.timeSinceSigning.help=Quando você completa uma negociação bem sucedida com um par que tem uma conta de pagamento assinada, a sua conta de pagamento é assinada.\n{0} dias depois, o limite inicial de {1} é levantado e sua conta pode assinar as contas de pagamento de outros pares.
offerbook.timeSinceSigning.notSigned=Ainda não assinada
@@ -365,6 +368,7 @@ offerbook.nrOffers=N.º de ofertas: {0}
offerbook.volume={0} (mín. - máx.)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=Criar oferta para {0} {1}
offerbook.createOfferToBuy=Criar oferta para comprar {0}
offerbook.createOfferToSell=Criar oferta para vender {0}
diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties
index 3567f188eb..25bd0342ed 100644
--- a/core/src/main/resources/i18n/displayStrings_pt.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Eu confirmo
shared.openURL=Abrir {0}
shared.fiat=Moeda fiduciária
shared.crypto=Cripto
+shared.preciousMetals=TODO
shared.all=Tudo
shared.edit=Editar
shared.advancedOptions=Opções avançadas
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=account was banned
offerbook.timeSinceSigning.daysSinceSigning={0} dias
offerbook.timeSinceSigning.daysSinceSigning.long={0} desde a assinatura
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=Compre XMR com:
+offerbook.sellXmrFor=Venda XMR por:
offerbook.timeSinceSigning.help=Quando você completa com sucesso um negócio com um par que tenha uma conta de pagamento assinada, a sua conta de pagamento é assinada .\n{0} dias depois, o limite inicial de {1} é aumentado e a sua conta pode assinar contas de pagamento de outros pares.
offerbook.timeSinceSigning.notSigned=Ainda não assinada
@@ -362,6 +365,7 @@ offerbook.nrOffers=Nº de ofertas: {0}
offerbook.volume={0} (mín - máx)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=Criar oferta para {0} {1}
offerbook.createOfferToBuy=Criar nova oferta para comprar {0}
offerbook.createOfferToSell=Criar nova oferta para vender {0}
diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties
index 9e67e9e75b..1c1fffbf9d 100644
--- a/core/src/main/resources/i18n/displayStrings_ru.properties
+++ b/core/src/main/resources/i18n/displayStrings_ru.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Подтверждаю
shared.openURL=Открыть {0}
shared.fiat=Нац. валюта
shared.crypto=Криптовалюта
+shared.preciousMetals=Драгоценные металлы
shared.all=Все
shared.edit=Редактировать
shared.advancedOptions=Дополнительные настройки
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=account was banned
offerbook.timeSinceSigning.daysSinceSigning={0} дн.
offerbook.timeSinceSigning.daysSinceSigning.long={0} since signing
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=Купить XMR с помощью:
+offerbook.sellXmrFor=Продать XMR за:
offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n{0} days later, the initial limit of {1} is lifted and your account can sign other peers'' payment accounts.
offerbook.timeSinceSigning.notSigned=Not signed yet
@@ -362,6 +365,7 @@ offerbook.nrOffers=Кол-во предложений: {0}
offerbook.volume={0} (мин. — макс.)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=Создать предложение для {0} {1}
offerbook.createOfferToBuy=Создать новое предложение на покупку {0}
offerbook.createOfferToSell=Создать новое предложение на продажу {0}
diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties
index 34f0b3dda7..44778d952e 100644
--- a/core/src/main/resources/i18n/displayStrings_th.properties
+++ b/core/src/main/resources/i18n/displayStrings_th.properties
@@ -192,6 +192,7 @@ shared.iConfirm=ฉันยืนยัน
shared.openURL=เปิด {0}
shared.fiat=คำสั่ง
shared.crypto=คริปโต
+shared.preciousMetals=โลหะมีค่า
shared.all=ทั้งหมด
shared.edit=แก้ไข
shared.advancedOptions=ทางเลือกขั้นสูง
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=account was banned
offerbook.timeSinceSigning.daysSinceSigning={0} วัน
offerbook.timeSinceSigning.daysSinceSigning.long={0} since signing
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=ซื้อ XMR ด้วย:
+offerbook.sellXmrFor=ขาย XMR สำหรับ:
offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n{0} days later, the initial limit of {1} is lifted and your account can sign other peers'' payment accounts.
offerbook.timeSinceSigning.notSigned=Not signed yet
@@ -362,6 +365,7 @@ offerbook.nrOffers=No. ของข้อเสนอ: {0}
offerbook.volume={0} (ต่ำสุด - สูงสุด)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=สร้างข้อเสนอให้กับ {0} {1}
offerbook.createOfferToBuy=Create new offer to buy {0}
offerbook.createOfferToSell=Create new offer to sell {0}
diff --git a/core/src/main/resources/i18n/displayStrings_tr.properties b/core/src/main/resources/i18n/displayStrings_tr.properties
index a9e7e49a75..cc20d5348f 100644
--- a/core/src/main/resources/i18n/displayStrings_tr.properties
+++ b/core/src/main/resources/i18n/displayStrings_tr.properties
@@ -204,6 +204,7 @@ shared.iConfirm=Onaylıyorum
shared.openURL={0}'i aç
shared.fiat=Fiat
shared.crypto=Kripto
+shared.preciousMetals=Değerli Madenler
shared.traditional=Nakit
shared.otherAssets=diğer varlıklar
shared.other=Diğer
@@ -372,6 +373,8 @@ offerbook.timeSinceSigning.tooltip.checkmark.buyXmr=imzalı bir hesaptan XMR al
offerbook.timeSinceSigning.tooltip.checkmark.wait=minimal {0} gün bekleyin
offerbook.timeSinceSigning.tooltip.learnMore=Daha fazla bilgi edin
offerbook.xmrAutoConf=Otomatik onay etkin mi
+offerbook.buyXmrWith=XMR satın al:
+offerbook.sellXmrFor=XMR'i şunlar için satın:
offerbook.timeSinceSigning.help=Bir imzalı ödeme hesabı olan bir eş ile başarılı bir şekilde işlem yaptığınızda, ödeme hesabınız imzalanır.\n\
{0} gün sonra, başlangıç limiti {1} kaldırılır ve hesabınız diğer eşlerin ödeme hesaplarını imzalayabilir.
@@ -386,7 +389,7 @@ offerbook.volume={0} (min - maks)
offerbook.deposit=Mevduat XMR (%)
offerbook.deposit.help=Her yatırımcı tarafından işlemi garanti altına almak için ödenen mevduat. İşlem tamamlandığında geri verilecektir.
-offerbook.createNewOffer=teklif aç {0} {1}
+offerbook.createNewOffer=Teklif oluştur {0} {1}
offerbook.createOfferDisabled.tooltip=Bir seferde sadece bir teklif oluşturabilirsiniz
offerbook.takeOfferButton.tooltip=Teklifi al {0}
diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties
index 33f8bf350d..a7bf554be3 100644
--- a/core/src/main/resources/i18n/displayStrings_vi.properties
+++ b/core/src/main/resources/i18n/displayStrings_vi.properties
@@ -192,6 +192,7 @@ shared.iConfirm=Tôi xác nhận
shared.openURL=Mở {0}
shared.fiat=Tiền pháp định
shared.crypto=Tiền mã hóa
+shared.preciousMetals=Kim loại quý
shared.all=Tất cả
shared.edit=Chỉnh sửa
shared.advancedOptions=Tùy chọn nâng cao
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=account was banned
offerbook.timeSinceSigning.daysSinceSigning={0} ngày
offerbook.timeSinceSigning.daysSinceSigning.long={0} since signing
offerbook.xmrAutoConf=Is auto-confirm enabled
+offerbook.buyXmrWith=Mua XMR với:
+offerbook.sellXmrFor=Bán XMR để:
offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n{0} days later, the initial limit of {1} is lifted and your account can sign other peers'' payment accounts.
offerbook.timeSinceSigning.notSigned=Not signed yet
@@ -362,6 +365,7 @@ offerbook.nrOffers=Số chào giá: {0}
offerbook.volume={0} (min - max)
offerbook.deposit=Deposit XMR (%)
offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed.
+offerbook.createNewOffer=Tạo ưu đãi cho {0} {1}
offerbook.createOfferToBuy=Tạo chào giá mua mới {0}
offerbook.createOfferToSell=Tạo chào giá bán mới {0}
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
index bc2d39b144..ac6e618db1 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
@@ -192,6 +192,7 @@ shared.iConfirm=我确认
shared.openURL=打开 {0}
shared.fiat=法定货币
shared.crypto=加密
+shared.preciousMetals=贵金属
shared.all=全部
shared.edit=编辑
shared.advancedOptions=高级选项
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=账户已被封禁
offerbook.timeSinceSigning.daysSinceSigning={0} 天
offerbook.timeSinceSigning.daysSinceSigning.long=自验证{0}
offerbook.xmrAutoConf=是否开启自动确认
+offerbook.buyXmrWith=使用以下方式购买 XMR：
+offerbook.sellXmrFor=出售 XMR 以换取：
offerbook.timeSinceSigning.help=当您成功地完成与拥有已验证付款帐户的伙伴交易时，您的付款帐户已验证。\n{0} 天后，最初的 {1} 的限制解除以及你的账户可以验证其他人的付款账户。
offerbook.timeSinceSigning.notSigned=尚未验证
@@ -362,6 +365,7 @@ offerbook.nrOffers=报价数量：{0}
offerbook.volume={0}（最小 - 最大）
offerbook.deposit=XMR 保证金（%）
offerbook.deposit.help=交易双方均已支付保证金确保这个交易正常进行。这会在交易完成时退还。
+offerbook.createNewOffer=創建報價給 {0} {1}
offerbook.createOfferToBuy=创建新的报价来买入 {0}
offerbook.createOfferToSell=创建新的报价来卖出 {0}
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
index 39a9595119..40ae3bc5c6 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
@@ -192,6 +192,7 @@ shared.iConfirm=我確認
shared.openURL=打開 {0}
shared.fiat=法定貨幣
shared.crypto=加密
+shared.preciousMetals=貴金屬
shared.all=全部
shared.edit=編輯
shared.advancedOptions=高級選項
@@ -348,6 +349,8 @@ offerbook.timeSinceSigning.info.banned=賬户已被封禁
offerbook.timeSinceSigning.daysSinceSigning={0} 天
offerbook.timeSinceSigning.daysSinceSigning.long=自驗證{0}
offerbook.xmrAutoConf=是否開啟自動確認
+offerbook.buyXmrWith=購買 XMR 使用：
+offerbook.sellXmrFor=出售 XMR 以換取：
offerbook.timeSinceSigning.help=當您成功地完成與擁有已驗證付款帳户的夥伴交易時，您的付款帳户已驗證。\n{0} 天后，最初的 {1} 的限制解除以及你的賬户可以驗證其他人的付款賬户。
offerbook.timeSinceSigning.notSigned=尚未驗證
@@ -362,6 +365,7 @@ offerbook.nrOffers=報價數量：{0}
offerbook.volume={0}（最小 - 最大）
offerbook.deposit=XMR 保證金（%）
offerbook.deposit.help=交易雙方均已支付保證金確保這個交易正常進行。這會在交易完成時退還。
+offerbook.createNewOffer=創建報價給 {0} {1}
offerbook.createOfferToBuy=創建新的報價來買入 {0}
offerbook.createOfferToSell=創建新的報價來賣出 {0}
diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css
index 95b57a3af6..fc92b1c308 100644
--- a/desktop/src/main/java/haveno/desktop/haveno.css
+++ b/desktop/src/main/java/haveno/desktop/haveno.css
@@ -1237,6 +1237,14 @@ textfield */
-jfx-rippler-fill: -fx-accent;
}
+.tab:disabled .jfx-rippler {
+ -jfx-rippler-fill: none !important;
+}
+
+.tab:disabled .tab-label {
+ -fx-cursor: default !important;
+}
+
.jfx-tab-pane .headers-region .tab .tab-container .tab-close-button > .jfx-svg-glyph {
-fx-shape: "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z";
-jfx-size: 9;
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java
index c5def765e9..67591cbce4 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/BuyOfferView.java
@@ -18,6 +18,8 @@
package haveno.desktop.main.offer;
import com.google.inject.Inject;
+
+import haveno.core.locale.Res;
import haveno.core.offer.OfferDirection;
import haveno.core.user.Preferences;
import haveno.core.user.User;
@@ -42,4 +44,9 @@ public class BuyOfferView extends OfferView {
p2PService,
OfferDirection.BUY);
}
+
+ @Override
+ protected String getOfferLabel() {
+ return Res.get("offerbook.buyXmrWith");
+ }
}
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/OfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/OfferView.java
index fc7c0561f2..6f6aba7cbc 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/OfferView.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/OfferView.java
@@ -41,6 +41,7 @@ import haveno.desktop.main.offer.takeoffer.TakeOfferView;
import haveno.desktop.util.GUIUtil;
import haveno.network.p2p.P2PService;
import javafx.beans.value.ChangeListener;
+import javafx.scene.control.Label;
import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import org.jetbrains.annotations.NotNull;
@@ -52,7 +53,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
private OfferBookView<?, ?> fiatOfferBookView, cryptoOfferBookView, otherOfferBookView;
- private Tab fiatOfferBookTab, cryptoOfferBookTab, otherOfferBookTab;
+ private Tab labelTab, fiatOfferBookTab, cryptoOfferBookTab, otherOfferBookTab;
private final ViewLoader viewLoader;
private final Navigation navigation;
@@ -165,6 +166,8 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
}
+ protected abstract String getOfferLabel();
+
private void loadView(Class<? extends View> viewClass,
Class<? extends View> childViewClass,
@Nullable Object data) {
@@ -209,14 +212,24 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
tabPane.getSelectionModel().select(otherOfferBookTab);
} else {
if (fiatOfferBookTab == null) {
+
+ // add preceding label tab
+ labelTab = new Tab();
+ labelTab.setDisable(true);
+ labelTab.setContent(new Label());
+ labelTab.setClosable(false);
+ Label offerLabel = new Label(getOfferLabel()); // use overlay for label for custom formatting
+ offerLabel.getStyleClass().add("titled-group-bg-label");
+ offerLabel.setStyle("-fx-font-size: 1.4em;");
+ labelTab.setGraphic(offerLabel);
+
fiatOfferBookTab = new Tab(Res.get("shared.fiat").toUpperCase());
fiatOfferBookTab.setClosable(false);
cryptoOfferBookTab = new Tab(Res.get("shared.crypto").toUpperCase());
cryptoOfferBookTab.setClosable(false);
- otherOfferBookTab = new Tab(Res.get("shared.preciousMetals").toUpperCase());
+ otherOfferBookTab = new Tab(Res.get("shared.other").toUpperCase());
otherOfferBookTab.setClosable(false);
-
- tabPane.getTabs().addAll(fiatOfferBookTab, cryptoOfferBookTab, otherOfferBookTab);
+ tabPane.getTabs().addAll(labelTab, fiatOfferBookTab, cryptoOfferBookTab, otherOfferBookTab);
}
if (viewClass == FiatOfferBookView.class) {
fiatOfferBookView = (FiatOfferBookView) viewLoader.load(FiatOfferBookView.class);
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java
index 931f70ac66..fde0e57f02 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/SellOfferView.java
@@ -18,6 +18,8 @@
package haveno.desktop.main.offer;
import com.google.inject.Inject;
+
+import haveno.core.locale.Res;
import haveno.core.offer.OfferDirection;
import haveno.core.user.Preferences;
import haveno.core.user.User;
@@ -42,4 +44,9 @@ public class SellOfferView extends OfferView {
p2PService,
OfferDirection.SELL);
}
+
+ @Override
+ protected String getOfferLabel() {
+ return Res.get("offerbook.sellXmrFor");
+ }
}
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
index 0a37b36ed1..6d9575b0d3 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
@@ -52,7 +52,6 @@ import haveno.desktop.components.ColoredDecimalPlacesWithZerosText;
import haveno.desktop.components.HyperlinkWithIcon;
import haveno.desktop.components.InfoAutoTooltipLabel;
import haveno.desktop.components.PeerInfoIconTrading;
-import haveno.desktop.components.TitledGroupBg;
import haveno.desktop.main.MainView;
import haveno.desktop.main.account.AccountView;
import haveno.desktop.main.account.content.cryptoaccounts.CryptoAccountsView;
@@ -67,7 +66,6 @@ import haveno.desktop.main.portfolio.PortfolioView;
import haveno.desktop.main.portfolio.editoffer.EditOfferView;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
-import haveno.desktop.util.Layout;
import haveno.network.p2p.NodeAddress;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.value.ChangeListener;
@@ -106,7 +104,6 @@ import java.util.Comparator;
import java.util.Map;
import java.util.Optional;
-import static haveno.desktop.util.FormBuilder.addTitledGroupBg;
import static haveno.desktop.util.FormBuilder.addTopLabelAutoToolTipTextField;
abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewModel> extends ActivatableViewAndModel<R, M> {
@@ -119,7 +116,6 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
private final AccountAgeWitnessService accountAgeWitnessService;
private final SignedWitnessService signedWitnessService;
- private TitledGroupBg titledGroupBg;
protected AutocompleteComboBox<TradeCurrency> currencyComboBox;
private AutocompleteComboBox<PaymentMethod> paymentMethodComboBox;
private AutoTooltipButton createOfferButton;
@@ -170,18 +166,10 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
public void initialize() {
root.setPadding(new Insets(15, 15, 5, 15));
- titledGroupBg = addTitledGroupBg(
- root,
- gridRow,
- 2,
- ""
- );
- titledGroupBg.getStyleClass().add("last");
-
HBox offerToolsBox = new HBox();
offerToolsBox.setAlignment(Pos.BOTTOM_LEFT);
offerToolsBox.setSpacing(10);
- offerToolsBox.setPadding(new Insets(10, 0, 0, 0));
+ offerToolsBox.setPadding(new Insets(0, 0, 0, 0));
Tuple3<VBox, Label, AutocompleteComboBox<TradeCurrency>> currencyBoxTuple = FormBuilder.addTopLabelAutocompleteComboBox(
Res.get("offerbook.filterByCurrency"));
@@ -202,7 +190,7 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
createOfferButton = new AutoTooltipButton("");
createOfferButton.setMinHeight(40);
createOfferButton.setGraphicTextGap(10);
-
+ createOfferButton.setStyle("-fx-padding: 0 15 0 15;");
disabledCreateOfferButtonTooltip = new Label("");
disabledCreateOfferButtonTooltip.setMinSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
disabledCreateOfferButtonTooltip.setMaxSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
@@ -225,7 +213,7 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
GridPane.setHgrow(offerToolsBox, Priority.ALWAYS);
GridPane.setRowIndex(offerToolsBox, gridRow);
GridPane.setColumnSpan(offerToolsBox, 2);
- GridPane.setMargin(offerToolsBox, new Insets(Layout.FIRST_ROW_DISTANCE, 0, 0, 0));
+ GridPane.setMargin(offerToolsBox, new Insets(0, 0, 0, 0));
root.getChildren().add(offerToolsBox);
tableView = new TableView<>();
@@ -332,10 +320,6 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
@Override
protected void activate() {
- titledGroupBg.setText(getMarketTitle());
- titledGroupBg.setHelpUrl(model.getDirection() == OfferDirection.SELL
- ? "https://haveno.exchange/wiki/Introduction#In_a_nutshell"
- : "https://haveno.exchange/wiki/Taking_an_offer");
Map<String, Integer> offerCounts = OfferViewUtil.isShownAsBuyOffer(model.getDirection(), model.getSelectedTradeCurrency()) ? model.getSellOfferCounts() : model.getBuyOfferCounts();
currencyComboBox.setCellFactory(GUIUtil.getTradeCurrencyCellFactory(Res.get("shared.oneOffer"),