sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin-core/gui#251: Improve URI/file handling message

Browse Source 
ef3e1d7272d294c65cc9904079571cf67dc6c463 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 (a9d1b40d53ec417eefbe767aa66701ef8e1801d5)

  ![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 ef3e1d7272d294c65cc9904079571cf67dc6c463

Tree-SHA512: 8fbd1e3731b75866356fae201b3129126001600ca0197e83c05825e8c5bbbcf0132d6a6b808d7a5cbfbdde75ed1865ecbb651c30017570abd7c5803eff2b9306
This commit is contained in:
MarcoFalke 2021-03-29 07:39:40 +02:00 committed by Konstantin Akimov
parent 48d66fd1ab
commit 29a98c7826
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt/paymentserver.cpp
View File

@ -239,8 +239,8 @@ void PaymentServer::handleURIOrFile(const QString& s)
if (!IsValidDestination(dest)) { if (!IsValidDestination(dest)) {
if (uri.hasQueryItem("r")) { // payment request if (uri.hasQueryItem("r")) { // payment request
Q_EMIT message(tr("URI handling"), Q_EMIT message(tr("URI handling"),
tr("Cannot process payment request as BIP70 is no longer supported.")+ tr("Cannot process payment request as BIP70 is no longer supported.\n"
tr("Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70."), "Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70."),
CClientUIInterface::ICON_WARNING); CClientUIInterface::ICON_WARNING);
} else { } else {
Q_EMIT message(tr("URI handling"), QString::fromStdString(error_msg), Q_EMIT message(tr("URI handling"), QString::fromStdString(error_msg),
@ -262,8 +262,8 @@ void PaymentServer::handleURIOrFile(const QString& s)
if (QFile::exists(s)) // payment request file if (QFile::exists(s)) // payment request file
{ {
Q_EMIT message(tr("Payment request file handling"), Q_EMIT message(tr("Payment request file handling"),
tr("Cannot process payment request as BIP70 is no longer supported.")+ tr("Cannot process payment request as BIP70 is no longer supported.\n"
tr("Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70."), "Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70."),
CClientUIInterface::ICON_WARNING); CClientUIInterface::ICON_WARNING);
} }
} }