Skip to content

Commit ea3c9a9

Browse files
author
MarcoFalke
committed
Merge #251: Improve URI/file handling message
ef3e1d7 qt: Improve URI/file handling message (Hennadii Stepanov) Pull request description: This PR: - fixes missing spaces after full stops - makes the translation context much bigger The latter is the main motivation for this PR, as I became a translator 🐅 Screenshots: - master (a9d1b40) ![DeepinScreenshot_select-area_20210317211750](https://user-images.githubusercontent.com/32963518/111527570-bd776880-8768-11eb-9035-96bb08067e74.png) - this PR: ![Screenshot from 2021-03-17 21-13-36](https://user-images.githubusercontent.com/32963518/111527727-e7308f80-8768-11eb-95c7-e8b802bfed5f.png) ACKs for top commit: jarolrod: ACK ef3e1d7 Tree-SHA512: 8fbd1e3731b75866356fae201b3129126001600ca0197e83c05825e8c5bbbcf0132d6a6b808d7a5cbfbdde75ed1865ecbb651c30017570abd7c5803eff2b9306
2 parents de4d3ba + ef3e1d7 commit ea3c9a9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/qt/paymentserver.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ void PaymentServer::handleURIOrFile(const QString& s)
235235
if (!IsValidDestinationString(recipient.address.toStdString())) {
236236
if (uri.hasQueryItem("r")) { // payment request
237237
Q_EMIT message(tr("URI handling"),
238-
tr("Cannot process payment request because BIP70 is not supported.")+
239-
tr("Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.")+
240-
tr("If you are receiving this error you should request the merchant provide a BIP21 compatible URI."),
238+
tr("Cannot process payment request because BIP70 is not supported.\n"
239+
"Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.\n"
240+
"If you are receiving this error you should request the merchant provide a BIP21 compatible URI."),
241241
CClientUIInterface::ICON_WARNING);
242242
}
243243
Q_EMIT message(tr("URI handling"), tr("Invalid payment address %1").arg(recipient.address),
@@ -258,9 +258,9 @@ void PaymentServer::handleURIOrFile(const QString& s)
258258
if (QFile::exists(s)) // payment request file
259259
{
260260
Q_EMIT message(tr("Payment request file handling"),
261-
tr("Cannot process payment request because BIP70 is not supported.")+
262-
tr("Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.")+
263-
tr("If you are receiving this error you should request the merchant provide a BIP21 compatible URI."),
261+
tr("Cannot process payment request because BIP70 is not supported.\n"
262+
"Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.\n"
263+
"If you are receiving this error you should request the merchant provide a BIP21 compatible URI."),
264264
CClientUIInterface::ICON_WARNING);
265265
}
266266
}

0 commit comments

Comments
 (0)