From 8fe4e0bb3313927fc6e5c11ca1c3041522c01c76 Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Tue, 13 May 2025 08:47:48 -0400 Subject: [PATCH] use 'filter' for search boxes --- .../main/resources/i18n/displayStrings.properties | 14 ++++++++------ .../resources/i18n/displayStrings_cs.properties | 13 +++++++++---- .../resources/i18n/displayStrings_de.properties | 11 ++++++++--- .../resources/i18n/displayStrings_es.properties | 11 ++++++++--- .../resources/i18n/displayStrings_fa.properties | 10 +++++++--- .../resources/i18n/displayStrings_fr.properties | 11 ++++++++--- .../resources/i18n/displayStrings_it.properties | 11 ++++++++--- .../resources/i18n/displayStrings_ja.properties | 11 ++++++++--- .../resources/i18n/displayStrings_pt-br.properties | 11 ++++++++--- .../resources/i18n/displayStrings_pt.properties | 11 ++++++++--- .../resources/i18n/displayStrings_ru.properties | 11 ++++++++--- .../resources/i18n/displayStrings_th.properties | 11 ++++++++--- .../resources/i18n/displayStrings_tr.properties | 11 ++++++++--- .../resources/i18n/displayStrings_vi.properties | 11 ++++++++--- .../i18n/displayStrings_zh-hans.properties | 11 ++++++++--- .../i18n/displayStrings_zh-hant.properties | 11 ++++++++--- .../haveno/desktop/components/list/FilterBox.java | 11 +++++------ .../main/offer/offerbook/OfferBookView.java | 2 +- .../main/offer/signedoffer/SignedOfferView.java | 5 +---- .../portfolio/closedtrades/ClosedTradesView.java | 1 + .../portfolio/failedtrades/FailedTradesView.java | 2 +- .../main/portfolio/openoffer/OpenOffersView.fxml | 1 - .../main/portfolio/openoffer/OpenOffersView.java | 5 +---- .../portfolio/pendingtrades/PendingTradesView.java | 1 + .../desktop/main/support/dispute/DisputeView.java | 9 ++------- 25 files changed, 141 insertions(+), 76 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index c214a016dd..04b0e4e8fb 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -231,7 +231,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transactions at the moment. Please try again later. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled shared.pending=Pending shared.me=Me @@ -305,6 +304,14 @@ mainView.networkWarning.localhostMoneroLost=You lost the connection to the local mainView.version.update=(Update available) mainView.status.connections=Inbound connections: {0}\nOutbound connections: {1} +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -315,9 +322,6 @@ market.tabs.spreadCurrency=Offers by Currency market.tabs.spreadPayment=Offers by Payment Method market.tabs.trades=Trades -# OfferBookView -market.offerBook.filterPrompt=Filter - # OfferBookChartView market.offerBook.sellOffersHeaderLabel=Sell {0} to market.offerBook.buyOffersHeaderLabel=Buy {0} from @@ -1162,8 +1166,6 @@ support.tab.refund.support=Refund support.tab.arbitration.support=Arbitration support.tab.legacyArbitration.support=Legacy Arbitration support.tab.ArbitratorsSupportTickets={0}'s tickets -support.filter=Search disputes -support.filter.prompt=Enter trade ID, date, onion address or account data support.tab.SignedOffers=Signed Offers support.prompt.signedOffer.penalty.msg=This will charge the maker a penalty fee and return the remaining trade funds to their wallet. Are you sure you want to send?\n\n\ Offer ID: {0}\n\ diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index ce414afabd..712587590c 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -231,7 +231,6 @@ shared.delayedPayoutTxId=ID zpožděné platební transakce shared.delayedPayoutTxReceiverAddress=Zpožděná výplatní transakce odeslána na shared.unconfirmedTransactionsLimitReached=Momentálně máte příliš mnoho nepotvrzených transakcí. Prosím zkuste to znovu později. shared.numItemsLabel=Počet položek: {0} -shared.filter=Filtr shared.enabled=Aktivní shared.pending=Otevřené shared.me=Já @@ -304,6 +303,14 @@ mainView.networkWarning.localhostMoneroLost=Ztratili jste připojení k localhos mainView.version.update=(Dostupná aktualizace) mainView.status.connections=Příchozí připojení: {0}nOdchozí připojení: {1} +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -315,7 +322,7 @@ market.tabs.spreadPayment=Nabídky podle způsobů platby market.tabs.trades=Obchody # OfferBookView -market.offerBook.filterPrompt=Filtr +filter.prompt.offers=Filtr # OfferBookChartView market.offerBook.sellOffersHeaderLabel=Prodat {0} kupujícímu @@ -1125,8 +1132,6 @@ support.tab.refund.support=Vrácení peněz support.tab.arbitration.support=Arbitráž support.tab.legacyArbitration.support=Starší arbitráž support.tab.ArbitratorsSupportTickets=Úkoly pro {0} -support.filter=Hledat spory -support.filter.prompt=Zadejte ID obchodu, datum, onion adresu nebo údaje o účtu support.tab.SignedOffers=Podepsané nabídky support.prompt.signedOffer.penalty.msg=Tím se tvůrci účtuje sankční poplatek a zbývající prostředky z obchodu se vrátí do jeho peněženky. Jste si jisti, že chcete odeslat?\n\n\ ID nabídky: {0}\n\ diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 43b664b1cf..804de20779 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Transaktions-ID der verzögerten Auszahlung shared.delayedPayoutTxReceiverAddress=Verzögerte Auszahlungs-Transaktion gesendet an shared.unconfirmedTransactionsLimitReached=Sie haben im Moment zu viele unbestätigte Transaktionen. Bitte versuchen Sie es später noch einmal. shared.numItemsLabel=Anzahl der Einträge: {0} -shared.filter=Filter shared.enabled=Aktiviert @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Sie haben die Verbindung zu allen {0} mainView.networkWarning.localhostMoneroLost=Sie haben die Verbindung zum localhost Moneroknoten verloren.\nBitte starten Sie die Haveno Anwendung neu, um mit anderen Moneroknoten zu verbinden oder starten Sie den localhost Moneroknoten neu. mainView.version.update=(Update verfügbar) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -927,8 +934,6 @@ support.tab.mediation.support=Mediation support.tab.arbitration.support=Vermittlung support.tab.legacyArbitration.support=Legacy-Vermittlung support.tab.ArbitratorsSupportTickets={0} Tickets -support.filter=Konflikte durchsuchen -support.filter.prompt=Tragen sie Handel ID, Datum, Onion Adresse oder Kontodaten support.sigCheck.button=Signatur überprüfen support.sigCheck.popup.info=Fügen Sie die Zusammenfassungsnachricht des Schiedsverfahrens ein. Mit diesem Tool kann jeder Benutzer überprüfen, ob die Unterschrift des Schiedsrichters mit der Zusammenfassungsnachricht übereinstimmt. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index a4001cb075..f6584cb6b0 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=ID de transacción del pago demorado shared.delayedPayoutTxReceiverAddress=Transacción de pago demorado enviada a shared.unconfirmedTransactionsLimitReached=Tiene demasiadas transacciones no confirmadas en este momento. Por favor, inténtelo de nuevo más tarde. shared.numItemsLabel=Número de entradas: {0} -shared.filter=Filtro shared.enabled=Habilitado @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Perdió la conexión a todos los {0} mainView.networkWarning.localhostMoneroLost=Perdió la conexión al nodo Monero localhost.\nPor favor reinicie la aplicación Haveno para conectarse a otros nodos Monero o reinice el nodo Monero localhost. mainView.version.update=(Actualización disponible) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -928,8 +935,6 @@ support.tab.mediation.support=Mediación support.tab.arbitration.support=Arbitraje support.tab.legacyArbitration.support=Legado de arbitraje support.tab.ArbitratorsSupportTickets=Tickets de {0} -support.filter=Buscar disputas -support.filter.prompt=Introduzca ID de transacción, fecha, dirección onion o datos de cuenta. support.sigCheck.button=Comprobar firma support.sigCheck.popup.info=Pegue el mensaje resumido del proceso de arbitraje. Con esta herramienta, cualquier usuario puede verificar si la firma del árbitro coincide con el mensaje resumido. diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 891dc297da..6491346b1f 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transactions at the moment. Please try again later. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -285,6 +284,13 @@ mainView.networkWarning.allConnectionsLost=اتصال شما به تمام {0} mainView.networkWarning.localhostMoneroLost=اتصال شما به Node لوکال هاست بیتکوین قطع شد.\nلطفاً به منظور اتصال به سایر Nodeهای بیتکوین، برنامه‌ی Haveno یا Node لوکال هاست بیتکوین را مجددا راه اندازی کنید. mainView.version.update=(به روز رسانی موجود است) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter #################################################################### # MarketView @@ -926,8 +932,6 @@ support.tab.mediation.support=Mediation support.tab.arbitration.support=Arbitration support.tab.legacyArbitration.support=Legacy Arbitration support.tab.ArbitratorsSupportTickets={0}'s tickets -support.filter=Search disputes -support.filter.prompt=Enter trade ID, date, onion address or account data support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 0a0e1274ad..82193fe09e 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=ID de versement de la transaction délayé shared.delayedPayoutTxReceiverAddress=Transaction à versement delayé envoyée à shared.unconfirmedTransactionsLimitReached=Vous avez trop de transactions non confirmées pour le moment. Veuillez réessayer plus tard. shared.numItemsLabel=Nombres d'entrées: {0} -shared.filter=Filtre shared.enabled=Activé @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Vous avez perdu la connexion avec tou mainView.networkWarning.localhostMoneroLost=Vous avez perdu la connexion avec le localhost Monero node.\nVeuillez redémarrer l'application Haveno pour vous connecter à d'autres Monero nodes ou redémarrer le localhost Monero node. mainView.version.update=(Mise à jour disponible) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -929,8 +936,6 @@ support.tab.mediation.support=Médiation support.tab.arbitration.support=Arbitrage support.tab.legacyArbitration.support=Conclusion d'arbitrage support.tab.ArbitratorsSupportTickets=Tickets de {0} -support.filter=Chercher les litiges -support.filter.prompt=Saisissez l'ID du trade, la date, l'adresse "onion" ou les données du compte. support.sigCheck.button=Vérifier la signature support.sigCheck.popup.info=Collez le message récapitulatif du processus d'arbitrage. Avec cet outil, n'importe quel utilisateur peut vérifier si la signature de l'arbitre correspond au message récapitulatif. diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 7847646806..5f69d1a069 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=Al momento, hai troppe transazioni non confermate. Per favore riprova più tardi. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Hai perso la connessione a tutti i {0 mainView.networkWarning.localhostMoneroLost=Hai perso la connessione al nodo Monero in localhost.\nRiavvia l'applicazione Haveno per connetterti ad altri nodi Monero o riavvia il nodo Monero in localhost. mainView.version.update=(Aggiornamento disponibile) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -927,8 +934,6 @@ support.tab.mediation.support=Mediazione support.tab.arbitration.support=Arbitrato support.tab.legacyArbitration.support=Arbitrato Legacy support.tab.ArbitratorsSupportTickets=I ticket di {0} -support.filter=Search disputes -support.filter.prompt=Inserisci ID commerciale, data, indirizzo onion o dati dell'account support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 9036bd8e2d..c5ffb8af51 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=遅延支払いトランザクションID shared.delayedPayoutTxReceiverAddress=遅延支払いトランザクション送り先 shared.unconfirmedTransactionsLimitReached=現在、非確認されたトランザクションが多すぎます。しばらく待ってからもう一度試して下さい。 shared.numItemsLabel=記載事項の数: {0} -shared.filter=フィルター shared.enabled=有効されました @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=全ての{0}のネットワークピ mainView.networkWarning.localhostMoneroLost=ローカルホストビットコインノードへの接続が切断されました。\nHavenoアプリケーションを再起動して他のビットコインノードに接続するか、ローカルホストのビットコインノードを再起動してください。 mainView.version.update=(更新が利用可能) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -927,8 +934,6 @@ support.tab.mediation.support=調停 support.tab.arbitration.support=仲裁 support.tab.legacyArbitration.support=レガシー仲裁 support.tab.ArbitratorsSupportTickets={0} のチケット -support.filter=係争を検索 -support.filter.prompt=トレードID、日付、onionアドレスまたはアカウントデータを入力してください support.sigCheck.button=Check signature support.sigCheck.popup.info=仲裁プロセスの要約メッセージを貼り付けてください。このツールを使用すると、どんなユーザーでも仲裁者の署名が要約メッセージと一致するかどうかを確認できます。 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index f6520e8436..18a41324c0 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -221,7 +221,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=No momento, você possui muitas transações não-confirmadas. Tente novamente mais tarde. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -288,6 +287,14 @@ mainView.networkWarning.allConnectionsLost=Você perdeu sua conexão com todos o mainView.networkWarning.localhostMoneroLost=Você perdeu a conexão ao nó Monero do localhost.\nPor favor, reinicie o aplicativo Haveno para conectar-se a outros nós Monero ou reinicie o nó Monero do localhost. mainView.version.update=(Atualização disponível) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -929,8 +936,6 @@ support.tab.mediation.support=Mediação support.tab.arbitration.support=Arbitragem support.tab.legacyArbitration.support=Arbitração antiga support.tab.ArbitratorsSupportTickets=Tickets de {0} -support.filter=Search disputes -support.filter.prompt=Insira ID da negociação. data. endereço onion ou dados da conta support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index c69236f8b1..612f87f8a7 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transactions at the moment. Please try again later. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Você perdeu a conexão com todos os mainView.networkWarning.localhostMoneroLost=Perdeu a conexão ao nó Monero do localhost.\nPor favor recomeçar o programa do Haveno para conectar à outros nós Monero ou recomeçar o nó Monero do localhost. mainView.version.update=(Atualização disponível) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -926,8 +933,6 @@ support.tab.mediation.support=Mediação support.tab.arbitration.support=Arbitragem support.tab.legacyArbitration.support=Arbitragem Antiga support.tab.ArbitratorsSupportTickets=Bilhetes de {0} -support.filter=Search disputes -support.filter.prompt=Insira o ID do negócio, data, endereço onion ou dados da conta support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index f5ded7cdb2..28f5f5f236 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transactions at the moment. Please try again later. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Сбой соединения со в mainView.networkWarning.localhostMoneroLost=Сбой соединения с локальным узлом Биткойн.\nПерезапустите приложение для подключения к другим узлам Биткойн или перезапустите свой локальный узел Биткойн. mainView.version.update=(Имеется обновление) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -926,8 +933,6 @@ support.tab.mediation.support=Mediation support.tab.arbitration.support=Arbitration support.tab.legacyArbitration.support=Legacy Arbitration support.tab.ArbitratorsSupportTickets={0}'s tickets -support.filter=Search disputes -support.filter.prompt=Введите идентификатор сделки, дату, onion-адрес или данные учётной записи support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index d2d89f3b83..f35cc516e4 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transactions at the moment. Please try again later. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=คุณสูญเสียกา mainView.networkWarning.localhostMoneroLost=คุณสูญเสียการเชื่อมต่อไปยังโหนดเครือข่าย Monero localhost (แม่ข่ายเฉพาะที่)\nโปรดรีสตาร์ทแอ็พพลิเคชัน Haveno เพื่อเชื่อมต่อโหนด Monero อื่นหรือรีสตาร์ทโหนด Monero localhost mainView.version.update=(การอัพเดตพร้อมใช้งาน) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -926,8 +933,6 @@ support.tab.mediation.support=Mediation support.tab.arbitration.support=Arbitration support.tab.legacyArbitration.support=Legacy Arbitration support.tab.ArbitratorsSupportTickets={0}'s tickets -support.filter=Search disputes -support.filter.prompt=Enter trade ID, date, onion address or account data support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_tr.properties b/core/src/main/resources/i18n/displayStrings_tr.properties index 426c99500f..7625c9aa83 100644 --- a/core/src/main/resources/i18n/displayStrings_tr.properties +++ b/core/src/main/resources/i18n/displayStrings_tr.properties @@ -231,7 +231,6 @@ shared.delayedPayoutTxId=Gecikmiş ödeme işlem kimliği shared.delayedPayoutTxReceiverAddress=Gecikmiş ödeme işlemi gönderildi shared.unconfirmedTransactionsLimitReached=Şu anda çok fazla onaylanmamış işleminiz var. Lütfen daha sonra tekrar deneyin. shared.numItemsLabel=Girdi sayısı: {0} -shared.filter=Filtrele shared.enabled=Etkin shared.pending=Beklemede shared.me=Ben @@ -304,6 +303,14 @@ mainView.networkWarning.localhostMoneroLost=Yerel Monero düğümüne bağlantı mainView.version.update=(Güncelleme mevcut) mainView.status.connections=Gelen bağlantılar: {0}\nGiden bağlantılar: {1} +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -1120,8 +1127,6 @@ support.tab.refund.support=Geri Ödeme support.tab.arbitration.support=Arbitraj support.tab.legacyArbitration.support=Eski Arbitraj support.tab.ArbitratorsSupportTickets={0}'nin biletleri -support.filter=Uyuşmazlıkları ara -support.filter.prompt=İşlem ID'si, tarih, onion adresi veya hesap verilerini girin support.tab.SignedOffers=İmzalı Teklifler support.prompt.signedOffer.penalty.msg=Bu, üreticiden bir ceza ücreti alacak ve kalan işlem fonlarını cüzdanına iade edecektir. Göndermek istediğinizden emin misiniz?\n\n\ Teklif ID'si: {0}\n\ diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 4df8f44b16..9663f63993 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=Delayed payout transaction ID shared.delayedPayoutTxReceiverAddress=Delayed payout transaction sent to shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transactions at the moment. Please try again later. shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=Enabled @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=Mất kết nối tới tất cả m mainView.networkWarning.localhostMoneroLost=Mất kết nối tới nút Monero máy chủ nội bộ.\nVui lòng khởi động lại ứng dụng Haveno để nối với nút Monero khác hoặc khởi động lại nút Monero máy chủ nội bộ. mainView.version.update=(Có cập nhật) +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -928,8 +935,6 @@ support.tab.mediation.support=Mediation support.tab.arbitration.support=Arbitration support.tab.legacyArbitration.support=Legacy Arbitration support.tab.ArbitratorsSupportTickets={0}'s tickets -support.filter=Search disputes -support.filter.prompt=Nhập ID giao dịch, ngày tháng, địa chỉ onion hoặc dữ liệu tài khoản support.sigCheck.button=Check signature support.sigCheck.popup.header=Verify dispute result signature diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 1e65527036..2a1a338842 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=延迟支付交易 ID shared.delayedPayoutTxReceiverAddress=延迟交易交易已发送至 shared.unconfirmedTransactionsLimitReached=你现在有过多的未确认交易。请稍后尝试 shared.numItemsLabel=实体数：{0} -shared.filter=过滤 shared.enabled=启用 @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=您失去了所有与 {0} 网络节 mainView.networkWarning.localhostMoneroLost=您丢失了与本地主机比特币节点的连接。\n请重启 Haveno 应用程序连接到其他比特币节点或重新启动主机比特币节点。 mainView.version.update=（有更新可用） +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -927,8 +934,6 @@ support.tab.mediation.support=调解 support.tab.arbitration.support=仲裁 support.tab.legacyArbitration.support=历史仲裁 support.tab.ArbitratorsSupportTickets={0} 的工单 -support.filter=查找纠纷 -support.filter.prompt=输入 交易 ID、日期、洋葱地址或账户信息 support.sigCheck.button=Check signature support.sigCheck.popup.info=请粘贴仲裁过程的摘要信息。使用这个工具，任何用户都可以检查仲裁者的签名是否与摘要信息相符。 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 05f8bb5e8d..d097c187e8 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -218,7 +218,6 @@ shared.delayedPayoutTxId=延遲支付交易 ID shared.delayedPayoutTxReceiverAddress=延遲交易交易已發送至 shared.unconfirmedTransactionsLimitReached=你現在有過多的未確認交易。請稍後嘗試 shared.numItemsLabel=Number of entries: {0} -shared.filter=Filter shared.enabled=啟用 @@ -285,6 +284,14 @@ mainView.networkWarning.allConnectionsLost=您失去了所有與 {0} 網絡節 mainView.networkWarning.localhostMoneroLost=您丟失了與本地主機比特幣節點的連接。\n請重啟 Haveno 應用程序連接到其他比特幣節點或重新啟動主機比特幣節點。 mainView.version.update=（有更新可用） +#################################################################### +# Filters +#################################################################### + +filter.prompt.offers=Filter +filter.prompt.trades=Filter +filter.prompt.disputes=Filter + #################################################################### # MarketView @@ -927,8 +934,6 @@ support.tab.mediation.support=調解 support.tab.arbitration.support=仲裁 support.tab.legacyArbitration.support=歷史仲裁 support.tab.ArbitratorsSupportTickets={0} 的工單 -support.filter=查找糾紛 -support.filter.prompt=輸入 交易 ID、日期、洋葱地址或賬户信息 support.sigCheck.button=Check signature support.sigCheck.popup.info=請貼上仲裁程序的摘要訊息。利用這個工具，任何使用者都可以檢查仲裁者的簽名是否與摘要訊息相符。 diff --git a/desktop/src/main/java/haveno/desktop/components/list/FilterBox.java b/desktop/src/main/java/haveno/desktop/components/list/FilterBox.java index 9bed491f49..b6cb412d27 100644 --- a/desktop/src/main/java/haveno/desktop/components/list/FilterBox.java +++ b/desktop/src/main/java/haveno/desktop/components/list/FilterBox.java @@ -18,12 +18,10 @@ package haveno.desktop.components.list; import haveno.core.locale.Res; -import haveno.desktop.components.AutoTooltipLabel; import haveno.desktop.components.InputTextField; import haveno.desktop.util.filtering.FilterableListItem; import javafx.beans.value.ChangeListener; import javafx.collections.transformation.FilteredList; -import javafx.geometry.Insets; import javafx.scene.control.TableView; import javafx.scene.layout.HBox; @@ -37,13 +35,10 @@ public class FilterBox extends HBox { super(); setSpacing(5.0); - AutoTooltipLabel label = new AutoTooltipLabel(Res.get("shared.filter")); - HBox.setMargin(label, new Insets(5.0, 0, 0, 10.0)); - textField = new InputTextField(); textField.setMinWidth(500); - getChildren().addAll(label, textField); + getChildren().addAll(textField); } public void initialize(FilteredList filteredList, @@ -67,4 +62,8 @@ public class FilterBox extends HBox { private void applyFilteredListPredicate(String filterString) { filteredList.setPredicate(item -> item.match(filterString)); } + + public void setPromptText(String promptText) { + textField.setPromptText(promptText); + } } 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 4aa5a2a187..7987da732e 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 @@ -217,7 +217,7 @@ abstract public class OfferBookView autoToolTipTextField = addTopLabelAutoToolTipTextField(""); VBox filterBox = autoToolTipTextField.first; filterInputField = autoToolTipTextField.third; - filterInputField.setPromptText(Res.get("market.offerBook.filterPrompt")); + filterInputField.setPromptText(Res.get("filter.prompt.offers")); filterInputField.getStyleClass().add("input-with-border"); offerToolsBox.getChildren().addAll(currencyBoxTuple.first, paymentBoxTuple.first, diff --git a/desktop/src/main/java/haveno/desktop/main/offer/signedoffer/SignedOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/signedoffer/SignedOfferView.java index f241797fc7..c3ac4ec660 100644 --- a/desktop/src/main/java/haveno/desktop/main/offer/signedoffer/SignedOfferView.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/signedoffer/SignedOfferView.java @@ -98,10 +98,6 @@ public class SignedOfferView extends ActivatableViewAndModel applyFilteredListPredicate(filterTextField.getText()); searchBox.setSpacing(5); diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml index 035ec5fbdc..44b26f1bd3 100644 --- a/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.fxml @@ -35,7 +35,6 @@ - diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java index dda69db99e..e46d18ad6f 100644 --- a/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java @@ -116,8 +116,6 @@ public class OpenOffersView extends ActivatableViewAndModel applyFilteredListPredicate(filterTextField.getText()); searchBox.setSpacing(5); HBox.setHgrow(searchBoxSpacer, Priority.ALWAYS); diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java index 3a1fcf0912..b08f464d8c 100644 --- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java +++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java @@ -284,6 +284,7 @@ public class PendingTradesView extends ActivatableViewAndModel implements @Override public void initialize() { - Label label = new AutoTooltipLabel(Res.get("support.filter")); - HBox.setMargin(label, new Insets(5, 0, 0, 0)); - HBox.setHgrow(label, Priority.NEVER); - filterTextField = new InputTextField(); - filterTextField.setPromptText(Res.get("support.filter.prompt")); + filterTextField.setPromptText(Res.get("filter.prompt.disputes")); Tooltip tooltip = new Tooltip(); tooltip.setShowDelay(Duration.millis(100)); tooltip.setShowDuration(Duration.seconds(10)); @@ -298,8 +294,7 @@ public abstract class DisputeView extends ActivatableView implements HBox filterBox = new HBox(); filterBox.setSpacing(5); - filterBox.getChildren().addAll(label, - filterTextField, + filterBox.getChildren().addAll(filterTextField, alertIconLabel, spacer, reOpenButton,