From cfc67f35eaffb3323c37a88d2747309b2ab59293 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sun, 8 Sep 2019 14:36:12 -0400 Subject: [PATCH 1/3] Revert "Add tr translation to qt config" This reverts commit 5a57de41454b5b85db8ee5794c8eecea8b1861c0. --- silentdragon.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/silentdragon.pro b/silentdragon.pro index 32ca2a8..520439f 100644 --- a/silentdragon.pro +++ b/silentdragon.pro @@ -118,7 +118,6 @@ TRANSLATIONS = res/zec_qt_wallet_es.ts \ res/zec_qt_wallet_it.ts \ res/zec_qt_wallet_zh.ts \ res/zec_qt_wallet_ru.ts \ - res/zec_qt_wallet_tr.ts \ res/zec_qt_wallet_uk.ts include(singleapplication/singleapplication.pri) From c7e56e21ac33e24ea2c44d3cb1f184ecf5ab8ebf Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 11 Sep 2019 09:25:54 -0400 Subject: [PATCH 2/3] use correct wormhole, derp --- src/websockets.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/websockets.cpp b/src/websockets.cpp index a0f34a2..58ee1b8 100644 --- a/src/websockets.cpp +++ b/src/websockets.cpp @@ -112,7 +112,8 @@ void WormholeClient::connect() { QObject::connect(m_webSocket, &QWebSocket::connected, this, &WormholeClient::onConnected); QObject::connect(m_webSocket, &QWebSocket::disconnected, this, &WormholeClient::closed); - m_webSocket->open(QUrl("wss://wormhole.zecqtwallet.com:443")); + m_webSocket->open(QUrl("wss://wormhole.myhush.org:443")); + //TODO: use env var to over-ride //m_webSocket->open(QUrl("ws://127.0.0.1:7070")); } From abbe325ade481691394f9f4b16ec362349e5b68e Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Thu, 12 Sep 2019 06:07:00 -0700 Subject: [PATCH 3/3] Fix address format error message --- res/zec_qt_wallet_de.ts | 2 +- res/zec_qt_wallet_es.ts | 2 +- res/zec_qt_wallet_fr.ts | 2 +- res/zec_qt_wallet_it.ts | 2 +- res/zec_qt_wallet_pt.ts | 2 +- res/zec_qt_wallet_template.ts | 2 +- src/mainwindow.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/res/zec_qt_wallet_de.ts b/res/zec_qt_wallet_de.ts index 7ae446b..8e16394 100644 --- a/res/zec_qt_wallet_de.ts +++ b/res/zec_qt_wallet_de.ts @@ -678,7 +678,7 @@ - Error paying pirate URI + Error paying Hush URI Fehler bei der Bezahl HUSH URI diff --git a/res/zec_qt_wallet_es.ts b/res/zec_qt_wallet_es.ts index 8bd59f3..d4eab76 100644 --- a/res/zec_qt_wallet_es.ts +++ b/res/zec_qt_wallet_es.ts @@ -634,7 +634,7 @@ - Error paying pirate URI + Error paying Hush URI Error al pagar HUSH URI diff --git a/res/zec_qt_wallet_fr.ts b/res/zec_qt_wallet_fr.ts index d6329b4..4fe5f31 100644 --- a/res/zec_qt_wallet_fr.ts +++ b/res/zec_qt_wallet_fr.ts @@ -664,7 +664,7 @@ - Error paying pirate URI + Error paying Hush URI Erreur lors du paiement de l'URI diff --git a/res/zec_qt_wallet_it.ts b/res/zec_qt_wallet_it.ts index 999b05f..5d78d48 100644 --- a/res/zec_qt_wallet_it.ts +++ b/res/zec_qt_wallet_it.ts @@ -642,7 +642,7 @@ - Error paying pirate URI + Error paying Hush URI Errore nel pagamento dell'URI Hush diff --git a/res/zec_qt_wallet_pt.ts b/res/zec_qt_wallet_pt.ts index 11903bf..28860e0 100644 --- a/res/zec_qt_wallet_pt.ts +++ b/res/zec_qt_wallet_pt.ts @@ -634,7 +634,7 @@ - Error paying pirate URI + Error paying Hush URI diff --git a/res/zec_qt_wallet_template.ts b/res/zec_qt_wallet_template.ts index 040a4e5..65ede06 100644 --- a/res/zec_qt_wallet_template.ts +++ b/res/zec_qt_wallet_template.ts @@ -642,7 +642,7 @@ - Error paying pirate URI + Error paying Hush URI diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1ad4da5..399468a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -891,7 +891,7 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) { qDebug() << "Received URI " << uri; PaymentURI paymentInfo = Settings::parseURI(uri); if (!paymentInfo.error.isEmpty()) { - QMessageBox::critical(this, tr("Error paying pirate URI"), + QMessageBox::critical(this, tr("Error paying Hush URI"), tr("URI should be of the form 'hush:?amt=x&memo=y") + "\n" + paymentInfo.error); return; }