mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
Update bond lockup prompt
- Changed display string from "lockup time" to "unlock time" otherwise it may be confused with how long it takes to lock up the bond. - Included estimated time duration (e.g. days) for the unlock time.
This commit is contained in:
parent
89c9fd20b0
commit
5293b4a494
@ -1411,9 +1411,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Sperren
|
||||
dao.bond.reputation.lockup.headline=Sperrung-Transaktion bestätigen
|
||||
dao.bond.reputation.lockup.details=Gesperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block)\n\nSind Sie sicher, dass Sie fortfahren möchten?
|
||||
dao.bond.reputation.lockup.details=Gesperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block) (≈{2})\n\nSind Sie sicher, dass Sie fortfahren möchten?
|
||||
dao.bond.reputation.unlock.headline=Entsperrung-Transaktion bestätigen
|
||||
dao.bond.reputation.unlock.details=Entsperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block)\n\nSind Sie sicher, dass Sie fortfahren möchten?
|
||||
dao.bond.reputation.unlock.details=Entsperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block) (≈{2})\n\nSind Sie sicher, dass Sie fortfahren möchten?
|
||||
|
||||
dao.bond.allBonds.header=Alle Pfänder
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Bloquear
|
||||
dao.bond.reputation.lockup.headline=Confirmar transacción de bloqueo
|
||||
dao.bond.reputation.lockup.details=Cantidad bloqueada: {0}\nTiempo de bloqueo: {1} bloque(s)\n\nEstá seguro de que quiere proceder?
|
||||
dao.bond.reputation.lockup.details=Cantidad bloqueada: {0}\nTiempo de bloqueo: {1} bloque(s) (≈{2})\n\nEstá seguro de que quiere proceder?
|
||||
dao.bond.reputation.unlock.headline=Confirmar desbloqueo de transacción
|
||||
dao.bond.reputation.unlock.details=Cantidad a desbloquear: {0}\nTiempo de bloqueo: {1} bloque(s)\n\nEstá seguro de que quiere proceder?
|
||||
dao.bond.reputation.unlock.details=Cantidad a desbloquear: {0}\nTiempo de bloqueo: {1} bloque(s) (≈{2})\n\nEstá seguro de que quiere proceder?
|
||||
|
||||
dao.bond.allBonds.header=Todos los bonos
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=داده تصادفی
|
||||
dao.bond.reputation.hash=تابع درهم ساز (هش)
|
||||
dao.bond.reputation.lockupButton=قفل کردن
|
||||
dao.bond.reputation.lockup.headline=تایید تراکنش قفل کردن وجه
|
||||
dao.bond.reputation.lockup.details=مقدار وجه قفل شده: {0}\nمدت زمان قفل ماندن: ({1}) بلاک\n\nآیا از ادامه دادن مطمئنید؟
|
||||
dao.bond.reputation.lockup.details=مقدار وجه قفل شده: {0}\nمدت زمان قفل ماندن: ({1}) بلاک (≈{2})\n\nآیا از ادامه دادن مطمئنید؟
|
||||
dao.bond.reputation.unlock.headline=تایید تراکنش رها کردن وجه
|
||||
dao.bond.reputation.unlock.details=مقدار رها شدن وجه: {0}\nمدت زمان قفل شدن: ({1}) بلاک\n\nآیا از ادامه دادن مطمئنید؟
|
||||
dao.bond.reputation.unlock.details=مقدار رها شدن وجه: {0}\nمدت زمان قفل شدن: ({1}) بلاک (≈{2})\n\nآیا از ادامه دادن مطمئنید؟
|
||||
|
||||
dao.bond.allBonds.header=همه ضمانتها
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Sal
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Travar
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Соль
|
||||
dao.bond.reputation.hash=Хеш
|
||||
dao.bond.reputation.lockupButton=Запереть
|
||||
dao.bond.reputation.lockup.headline=Подтвердить транзакцию блокировки
|
||||
dao.bond.reputation.lockup.details=Запереть сумму: {0}\nВремя блокировки: {1} блок(ов) \n\nДействительно желаете продолжить?
|
||||
dao.bond.reputation.lockup.details=Запереть сумму: {0}\nВремя блокировки: {1} блок(ов) (≈{2})\n\nДействительно желаете продолжить?
|
||||
dao.bond.reputation.unlock.headline=Подтвердить транзакцию разблокировки
|
||||
dao.bond.reputation.unlock.details=Отпереть сумму: {0}\nВремя блокировки: {1} блок(ов)\n\nДействительно желаете продолжить?
|
||||
dao.bond.reputation.unlock.details=Отпереть сумму: {0}\nВремя блокировки: {1} блок(ов) (≈{2})\n\nДействительно желаете продолжить?
|
||||
|
||||
dao.bond.allBonds.header=Все гарантийные депозиты
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=ข้อมูลแบบสุ่ม
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=ล็อค
|
||||
dao.bond.reputation.lockup.headline=ยืนยันล็อคการทำรายการ
|
||||
dao.bond.reputation.lockup.details=ล็อคจำนวน: {0}\nล็อคเวลา: {1} บล็อก\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?
|
||||
dao.bond.reputation.lockup.details=ล็อคจำนวน: {0}\nล็อคเวลา: {1} บล็อก (≈{2})\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?
|
||||
dao.bond.reputation.unlock.headline=ยืนยันการปลดล็อกธุรกรรม
|
||||
dao.bond.reputation.unlock.details=จำนวนที่ปลดล็อค: {0}\nเวลาในการล็อค: {1} บล็อก (s)\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ
|
||||
dao.bond.reputation.unlock.details=จำนวนที่ปลดล็อค: {0}\nเวลาในการล็อค: {1} บล็อก (s) (≈{2})\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ
|
||||
|
||||
dao.bond.allBonds.header=การค้ำประกันทั้งหมด
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Khóa
|
||||
dao.bond.reputation.lockup.headline=Xác nhận giao dịch khóa
|
||||
dao.bond.reputation.lockup.details=Số lượng khóa: {0}\nThời gian khóa: {1} khối\n\nBạn có thực sự muốn tiếp tục?
|
||||
dao.bond.reputation.lockup.details=Số lượng khóa: {0}\nThời gian khóa: {1} khối (≈{2})\n\nBạn có thực sự muốn tiếp tục?
|
||||
dao.bond.reputation.unlock.headline=Xác nhận giao dịch mở khóa
|
||||
dao.bond.reputation.unlock.details=Số lượng mở khóa: {0}\nThời gian mở khóa: {1} khối\n\nBạn có thực sự muốn tiếp tục?
|
||||
dao.bond.reputation.unlock.details=Số lượng mở khóa: {0}\nThời gian mở khóa: {1} khối (≈{2})\n\nBạn có thực sự muốn tiếp tục?
|
||||
|
||||
dao.bond.allBonds.header=Tất cả cách tài sản đảm bảo
|
||||
|
||||
|
@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
|
||||
dao.bond.reputation.hash=Hash
|
||||
dao.bond.reputation.lockupButton=Lockup
|
||||
dao.bond.reputation.lockup.headline=Confirm lockup transaction
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.headline=Confirm unlock transaction
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
|
||||
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
|
||||
|
||||
dao.bond.allBonds.header=All bonds
|
||||
|
||||
|
@ -34,6 +34,7 @@ import bisq.core.dao.state.model.blockchain.TxOutput;
|
||||
import bisq.core.dao.state.model.governance.BondedRoleType;
|
||||
import bisq.core.dao.state.model.governance.Role;
|
||||
import bisq.core.locale.Res;
|
||||
import bisq.core.util.BSFormatter;
|
||||
import bisq.core.util.BsqFormatter;
|
||||
|
||||
import bisq.network.p2p.P2PService;
|
||||
@ -100,10 +101,13 @@ public class BondingViewUtils {
|
||||
Consumer<String> resultHandler) {
|
||||
if (GUIUtil.isReadyForTxBroadcast(p2PService, walletsSetup)) {
|
||||
if (!DevEnv.isDevMode()) {
|
||||
BSFormatter formatter = new BSFormatter();
|
||||
String duration = formatter.formatDurationAsWords(lockupTime * 10 * 60 * 1000L, false, false);
|
||||
new Popup<>().headLine(Res.get("dao.bond.reputation.lockup.headline"))
|
||||
.confirmation(Res.get("dao.bond.reputation.lockup.details",
|
||||
bsqFormatter.formatCoinWithCode(lockupAmount),
|
||||
lockupTime
|
||||
lockupTime,
|
||||
duration
|
||||
))
|
||||
.actionButtonText(Res.get("shared.yes"))
|
||||
.onAction(() -> publishLockupTx(hash, lockupAmount, lockupTime, lockupReason, resultHandler))
|
||||
@ -143,10 +147,13 @@ public class BondingViewUtils {
|
||||
|
||||
try {
|
||||
if (!DevEnv.isDevMode()) {
|
||||
BSFormatter formatter = new BSFormatter();
|
||||
String duration = formatter.formatDurationAsWords(lockTime * 10 * 60 * 1000L, false, false);
|
||||
new Popup<>().headLine(Res.get("dao.bond.reputation.unlock.headline"))
|
||||
.confirmation(Res.get("dao.bond.reputation.unlock.details",
|
||||
bsqFormatter.formatCoinWithCode(unlockAmount),
|
||||
lockTime
|
||||
lockTime,
|
||||
duration
|
||||
))
|
||||
.actionButtonText(Res.get("shared.yes"))
|
||||
.onAction(() -> publishUnlockTx(lockupTxId, resultHandler))
|
||||
|
Loading…
Reference in New Issue
Block a user