[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-wallet-webex] 03/03: some UI fixes
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-wallet-webex] 03/03: some UI fixes |
|
Date: |
Sun, 04 Jun 2017 17:57:00 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-webex.
commit c88bcce9987d4b5cc8123002485a928ff4191e94
Author: Florian Dold <address@hidden>
AuthorDate: Sun Jun 4 17:56:55 2017 +0200
some UI fixes
---
src/i18n/de.po | 96 +++++++++++++++---------------
src/i18n/en-US.po | 94 ++++++++++++++---------------
src/i18n/fr.po | 94 ++++++++++++++---------------
src/i18n/it.po | 94 ++++++++++++++---------------
src/i18n/strings.ts | 16 ++---
src/i18n/taler-wallet-webex.pot | 94 ++++++++++++++---------------
src/webex/pages/confirm-contract.tsx | 14 ++++-
src/webex/pages/confirm-create-reserve.tsx | 28 +++++----
src/webex/pages/payback.tsx | 4 +-
src/webex/pages/popup.tsx | 19 +++---
src/webex/pages/tree.tsx | 20 ++++---
src/webex/renderHtml.tsx | 12 ++++
12 files changed, 306 insertions(+), 279 deletions(-)
diff --git a/src/i18n/de.po b/src/i18n/de.po
index 79f6a6e1..6fa2e657 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:142
+#: src/webex/pages/confirm-contract.tsx:154
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:144
+#: src/webex/pages/confirm-contract.tsx:156
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,67 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:206
#, fuzzy, c-format
-msgid "Withdrawal fees: %1$s"
+msgid "Withdrawal fees:"
msgstr "Abheben bei %1$s"
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
-msgid "Rounding loss: %1$s"
+msgid "Rounding loss:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:211
+#: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format
msgid "# Coins"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:212
+#: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format
msgid "Value"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-create-reserve.tsx:215
#, fuzzy, c-format
msgid "Withdraw Fee"
msgstr "Abheben bei %1$s"
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
msgid "Refresh Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format
msgid "Deposit Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:268
+#: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:284
+#: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:352
+#: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format
msgid "The exchange is trusted by the wallet.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:358
+#: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format
msgid "The exchange is audited by a trusted auditor.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:364
+#: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format
msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +124,7 @@ msgid ""
"If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format
msgid ""
"Using exchange provider%1$s.\n"
@@ -132,156 +132,156 @@ msgid ""
" %2$s in fees.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:387
+#: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format
msgid ""
"Waiting for a response from\n"
" %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:398
+#: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format
msgid "A problem occured, see below. %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:404
+#: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format
msgid ""
"Information about fees will be available when an exchange provider is "
"selected."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:416
+#: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format
msgid "Accept fees and withdraw"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:421
+#: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format
msgid "Change Exchange Provider"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:477
+#: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:560
+#: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:571
+#: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:585
+#: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:612
+#: src/webex/pages/confirm-create-reserve.tsx:614
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
-#: src/webex/pages/popup.tsx:161
+#: src/webex/pages/popup.tsx:160
#, c-format
msgid "Balance"
msgstr "Saldo"
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:163
#, c-format
msgid "History"
msgstr "Verlauf"
-#: src/webex/pages/popup.tsx:167
+#: src/webex/pages/popup.tsx:166
#, c-format
msgid "Debug"
msgstr "Debug"
-#: src/webex/pages/popup.tsx:243
+#: src/webex/pages/popup.tsx:242
#, c-format
msgid "help"
msgstr ""
-#: src/webex/pages/popup.tsx:248
+#: src/webex/pages/popup.tsx:247
#, fuzzy, c-format
msgid ""
"You have no balance to show. Need some\n"
" %1$s getting started?\n"
msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
-#: src/webex/pages/popup.tsx:265
+#: src/webex/pages/popup.tsx:264
#, c-format
msgid "%1$s incoming\n"
msgstr ""
-#: src/webex/pages/popup.tsx:278
+#: src/webex/pages/popup.tsx:277
#, c-format
msgid "%1$s being spent\n"
msgstr ""
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:303
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:342
#, fuzzy, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
" %2$s.\n"
msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
-#: src/webex/pages/popup.tsx:354
+#: src/webex/pages/popup.tsx:353
#, fuzzy, c-format
msgid ""
"Started to withdraw\n"
" %1$s from%2$s(%3$s).\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:363
#, c-format
msgid "Merchant%1$soffered contract%2$s;\n"
msgstr ""
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:373
#, fuzzy, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:383
#, fuzzy, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
" (%3$s)\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-#: src/webex/pages/popup.tsx:393
+#: src/webex/pages/popup.tsx:392
#, c-format
msgid "Unknown event (%1$s)"
msgstr ""
-#: src/webex/pages/popup.tsx:436
+#: src/webex/pages/popup.tsx:435
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
-#: src/webex/pages/popup.tsx:470
+#: src/webex/pages/popup.tsx:469
#, c-format
msgid "Your wallet has no events recorded."
msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
-#: src/webex/renderHtml.tsx:49
+#: src/webex/renderHtml.tsx:51
#, fuzzy, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr ""
@@ -289,13 +289,13 @@ msgstr ""
" möchte einen Vertrag über %2$s\n"
" mit Ihnen abschließen."
-#: src/webex/renderHtml.tsx:54
+#: src/webex/renderHtml.tsx:56
#, fuzzy, c-format
msgid "You are about to purchase:"
msgstr "Sie sind dabei, Folgendes zu kaufen:"
#, fuzzy
-#~ msgid "Withdraw fees:"
+#~ msgid "Withdrawal fees: %1$s"
#~ msgstr "Abheben bei %1$s"
#~ msgid "Confirm Payment"
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 2e97531f..ab6e9d36 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:142
+#: src/webex/pages/confirm-contract.tsx:154
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:144
+#: src/webex/pages/confirm-contract.tsx:156
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,67 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format
-msgid "Withdrawal fees: %1$s"
+msgid "Withdrawal fees:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
-msgid "Rounding loss: %1$s"
+msgid "Rounding loss:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:211
+#: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format
msgid "# Coins"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:212
+#: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format
msgid "Value"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format
msgid "Withdraw Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
msgid "Refresh Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format
msgid "Deposit Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:268
+#: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:284
+#: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:352
+#: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format
msgid "The exchange is trusted by the wallet.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:358
+#: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format
msgid "The exchange is audited by a trusted auditor.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:364
+#: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format
msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +124,7 @@ msgid ""
"If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format
msgid ""
"Using exchange provider%1$s.\n"
@@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:387
+#: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format
msgid ""
"Waiting for a response from\n"
" %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:398
+#: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format
msgid "A problem occured, see below. %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:404
+#: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format
msgid ""
"Information about fees will be available when an exchange provider is "
"selected."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:416
+#: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format
msgid "Accept fees and withdraw"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:421
+#: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format
msgid "Change Exchange Provider"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:477
+#: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:560
+#: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:571
+#: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:585
+#: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:612
+#: src/webex/pages/confirm-create-reserve.tsx:614
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
-#: src/webex/pages/popup.tsx:161
+#: src/webex/pages/popup.tsx:160
#, c-format
msgid "Balance"
msgstr ""
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:163
#, c-format
msgid "History"
msgstr ""
-#: src/webex/pages/popup.tsx:167
+#: src/webex/pages/popup.tsx:166
#, c-format
msgid "Debug"
msgstr ""
-#: src/webex/pages/popup.tsx:243
+#: src/webex/pages/popup.tsx:242
#, c-format
msgid "help"
msgstr ""
-#: src/webex/pages/popup.tsx:248
+#: src/webex/pages/popup.tsx:247
#, c-format
msgid ""
"You have no balance to show. Need some\n"
" %1$s getting started?\n"
msgstr ""
-#: src/webex/pages/popup.tsx:265
+#: src/webex/pages/popup.tsx:264
#, c-format
msgid "%1$s incoming\n"
msgstr ""
-#: src/webex/pages/popup.tsx:278
+#: src/webex/pages/popup.tsx:277
#, c-format
msgid "%1$s being spent\n"
msgstr ""
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:303
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:342
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
" %2$s.\n"
msgstr ""
-#: src/webex/pages/popup.tsx:354
+#: src/webex/pages/popup.tsx:353
#, c-format
msgid ""
"Started to withdraw\n"
" %1$s from%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:363
#, c-format
msgid "Merchant%1$soffered contract%2$s;\n"
msgstr ""
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:373
#, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:383
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
" (%3$s)\n"
msgstr ""
-#: src/webex/pages/popup.tsx:393
+#: src/webex/pages/popup.tsx:392
#, c-format
msgid "Unknown event (%1$s)"
msgstr ""
-#: src/webex/pages/popup.tsx:436
+#: src/webex/pages/popup.tsx:435
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
-#: src/webex/pages/popup.tsx:470
+#: src/webex/pages/popup.tsx:469
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""
-#: src/webex/renderHtml.tsx:49
+#: src/webex/renderHtml.tsx:51
#, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr ""
-#: src/webex/renderHtml.tsx:54
+#: src/webex/renderHtml.tsx:56
#, c-format
msgid "You are about to purchase:"
msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index c6fddd9c..b08b98b8 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:142
+#: src/webex/pages/confirm-contract.tsx:154
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:144
+#: src/webex/pages/confirm-contract.tsx:156
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,67 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format
-msgid "Withdrawal fees: %1$s"
+msgid "Withdrawal fees:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
-msgid "Rounding loss: %1$s"
+msgid "Rounding loss:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:211
+#: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format
msgid "# Coins"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:212
+#: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format
msgid "Value"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format
msgid "Withdraw Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
msgid "Refresh Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format
msgid "Deposit Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:268
+#: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:284
+#: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:352
+#: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format
msgid "The exchange is trusted by the wallet.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:358
+#: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format
msgid "The exchange is audited by a trusted auditor.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:364
+#: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format
msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +124,7 @@ msgid ""
"If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format
msgid ""
"Using exchange provider%1$s.\n"
@@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:387
+#: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format
msgid ""
"Waiting for a response from\n"
" %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:398
+#: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format
msgid "A problem occured, see below. %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:404
+#: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format
msgid ""
"Information about fees will be available when an exchange provider is "
"selected."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:416
+#: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format
msgid "Accept fees and withdraw"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:421
+#: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format
msgid "Change Exchange Provider"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:477
+#: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:560
+#: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:571
+#: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:585
+#: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:612
+#: src/webex/pages/confirm-create-reserve.tsx:614
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
-#: src/webex/pages/popup.tsx:161
+#: src/webex/pages/popup.tsx:160
#, c-format
msgid "Balance"
msgstr ""
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:163
#, c-format
msgid "History"
msgstr ""
-#: src/webex/pages/popup.tsx:167
+#: src/webex/pages/popup.tsx:166
#, c-format
msgid "Debug"
msgstr ""
-#: src/webex/pages/popup.tsx:243
+#: src/webex/pages/popup.tsx:242
#, c-format
msgid "help"
msgstr ""
-#: src/webex/pages/popup.tsx:248
+#: src/webex/pages/popup.tsx:247
#, c-format
msgid ""
"You have no balance to show. Need some\n"
" %1$s getting started?\n"
msgstr ""
-#: src/webex/pages/popup.tsx:265
+#: src/webex/pages/popup.tsx:264
#, c-format
msgid "%1$s incoming\n"
msgstr ""
-#: src/webex/pages/popup.tsx:278
+#: src/webex/pages/popup.tsx:277
#, c-format
msgid "%1$s being spent\n"
msgstr ""
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:303
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:342
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
" %2$s.\n"
msgstr ""
-#: src/webex/pages/popup.tsx:354
+#: src/webex/pages/popup.tsx:353
#, c-format
msgid ""
"Started to withdraw\n"
" %1$s from%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:363
#, c-format
msgid "Merchant%1$soffered contract%2$s;\n"
msgstr ""
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:373
#, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:383
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
" (%3$s)\n"
msgstr ""
-#: src/webex/pages/popup.tsx:393
+#: src/webex/pages/popup.tsx:392
#, c-format
msgid "Unknown event (%1$s)"
msgstr ""
-#: src/webex/pages/popup.tsx:436
+#: src/webex/pages/popup.tsx:435
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
-#: src/webex/pages/popup.tsx:470
+#: src/webex/pages/popup.tsx:469
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""
-#: src/webex/renderHtml.tsx:49
+#: src/webex/renderHtml.tsx:51
#, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr ""
-#: src/webex/renderHtml.tsx:54
+#: src/webex/renderHtml.tsx:56
#, c-format
msgid "You are about to purchase:"
msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index c6fddd9c..b08b98b8 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:142
+#: src/webex/pages/confirm-contract.tsx:154
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:144
+#: src/webex/pages/confirm-contract.tsx:156
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,67 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format
-msgid "Withdrawal fees: %1$s"
+msgid "Withdrawal fees:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
-msgid "Rounding loss: %1$s"
+msgid "Rounding loss:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:211
+#: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format
msgid "# Coins"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:212
+#: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format
msgid "Value"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format
msgid "Withdraw Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
msgid "Refresh Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format
msgid "Deposit Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:268
+#: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:284
+#: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:352
+#: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format
msgid "The exchange is trusted by the wallet.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:358
+#: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format
msgid "The exchange is audited by a trusted auditor.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:364
+#: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format
msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +124,7 @@ msgid ""
"If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format
msgid ""
"Using exchange provider%1$s.\n"
@@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:387
+#: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format
msgid ""
"Waiting for a response from\n"
" %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:398
+#: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format
msgid "A problem occured, see below. %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:404
+#: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format
msgid ""
"Information about fees will be available when an exchange provider is "
"selected."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:416
+#: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format
msgid "Accept fees and withdraw"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:421
+#: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format
msgid "Change Exchange Provider"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:477
+#: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:560
+#: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:571
+#: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:585
+#: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:612
+#: src/webex/pages/confirm-create-reserve.tsx:614
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
-#: src/webex/pages/popup.tsx:161
+#: src/webex/pages/popup.tsx:160
#, c-format
msgid "Balance"
msgstr ""
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:163
#, c-format
msgid "History"
msgstr ""
-#: src/webex/pages/popup.tsx:167
+#: src/webex/pages/popup.tsx:166
#, c-format
msgid "Debug"
msgstr ""
-#: src/webex/pages/popup.tsx:243
+#: src/webex/pages/popup.tsx:242
#, c-format
msgid "help"
msgstr ""
-#: src/webex/pages/popup.tsx:248
+#: src/webex/pages/popup.tsx:247
#, c-format
msgid ""
"You have no balance to show. Need some\n"
" %1$s getting started?\n"
msgstr ""
-#: src/webex/pages/popup.tsx:265
+#: src/webex/pages/popup.tsx:264
#, c-format
msgid "%1$s incoming\n"
msgstr ""
-#: src/webex/pages/popup.tsx:278
+#: src/webex/pages/popup.tsx:277
#, c-format
msgid "%1$s being spent\n"
msgstr ""
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:303
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:342
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
" %2$s.\n"
msgstr ""
-#: src/webex/pages/popup.tsx:354
+#: src/webex/pages/popup.tsx:353
#, c-format
msgid ""
"Started to withdraw\n"
" %1$s from%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:363
#, c-format
msgid "Merchant%1$soffered contract%2$s;\n"
msgstr ""
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:373
#, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:383
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
" (%3$s)\n"
msgstr ""
-#: src/webex/pages/popup.tsx:393
+#: src/webex/pages/popup.tsx:392
#, c-format
msgid "Unknown event (%1$s)"
msgstr ""
-#: src/webex/pages/popup.tsx:436
+#: src/webex/pages/popup.tsx:435
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
-#: src/webex/pages/popup.tsx:470
+#: src/webex/pages/popup.tsx:469
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""
-#: src/webex/renderHtml.tsx:49
+#: src/webex/renderHtml.tsx:51
#, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr ""
-#: src/webex/renderHtml.tsx:54
+#: src/webex/renderHtml.tsx:56
#, c-format
msgid "You are about to purchase:"
msgstr ""
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index f2112254..242fecf5 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -39,10 +39,10 @@ strings['de'] = {
"You do not have any funds from an exchange that is accepted by this
merchant. None of the exchanges accepted by the merchant is known to your
wallet.": [
""
],
- "Withdrawal fees: %1$s": [
+ "Withdrawal fees:": [
"Abheben bei %1$s"
],
- "Rounding loss: %1$s": [
+ "Rounding loss:": [
""
],
"Earliest expiration (for deposit): %1$s": [
@@ -195,10 +195,10 @@ strings['en-US'] = {
"You do not have any funds from an exchange that is accepted by this
merchant. None of the exchanges accepted by the merchant is known to your
wallet.": [
""
],
- "Withdrawal fees: %1$s": [
+ "Withdrawal fees:": [
""
],
- "Rounding loss: %1$s": [
+ "Rounding loss:": [
""
],
"Earliest expiration (for deposit): %1$s": [
@@ -351,10 +351,10 @@ strings['fr'] = {
"You do not have any funds from an exchange that is accepted by this
merchant. None of the exchanges accepted by the merchant is known to your
wallet.": [
""
],
- "Withdrawal fees: %1$s": [
+ "Withdrawal fees:": [
""
],
- "Rounding loss: %1$s": [
+ "Rounding loss:": [
""
],
"Earliest expiration (for deposit): %1$s": [
@@ -507,10 +507,10 @@ strings['it'] = {
"You do not have any funds from an exchange that is accepted by this
merchant. None of the exchanges accepted by the merchant is known to your
wallet.": [
""
],
- "Withdrawal fees: %1$s": [
+ "Withdrawal fees:": [
""
],
- "Rounding loss: %1$s": [
+ "Rounding loss:": [
""
],
"Earliest expiration (for deposit): %1$s": [
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index c6fddd9c..b08b98b8 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:142
+#: src/webex/pages/confirm-contract.tsx:154
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:144
+#: src/webex/pages/confirm-contract.tsx:156
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,67 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format
-msgid "Withdrawal fees: %1$s"
+msgid "Withdrawal fees:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
-msgid "Rounding loss: %1$s"
+msgid "Rounding loss:"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:211
+#: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format
msgid "# Coins"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:212
+#: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format
msgid "Value"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format
msgid "Withdraw Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
msgid "Refresh Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format
msgid "Deposit Fee"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:268
+#: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:284
+#: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:352
+#: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format
msgid "The exchange is trusted by the wallet.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:358
+#: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format
msgid "The exchange is audited by a trusted auditor.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:364
+#: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format
msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +124,7 @@ msgid ""
"If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format
msgid ""
"Using exchange provider%1$s.\n"
@@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:387
+#: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format
msgid ""
"Waiting for a response from\n"
" %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:398
+#: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format
msgid "A problem occured, see below. %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:404
+#: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format
msgid ""
"Information about fees will be available when an exchange provider is "
"selected."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:416
+#: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format
msgid "Accept fees and withdraw"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:421
+#: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format
msgid "Change Exchange Provider"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:477
+#: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:560
+#: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:571
+#: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:585
+#: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:612
+#: src/webex/pages/confirm-create-reserve.tsx:614
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
-#: src/webex/pages/popup.tsx:161
+#: src/webex/pages/popup.tsx:160
#, c-format
msgid "Balance"
msgstr ""
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:163
#, c-format
msgid "History"
msgstr ""
-#: src/webex/pages/popup.tsx:167
+#: src/webex/pages/popup.tsx:166
#, c-format
msgid "Debug"
msgstr ""
-#: src/webex/pages/popup.tsx:243
+#: src/webex/pages/popup.tsx:242
#, c-format
msgid "help"
msgstr ""
-#: src/webex/pages/popup.tsx:248
+#: src/webex/pages/popup.tsx:247
#, c-format
msgid ""
"You have no balance to show. Need some\n"
" %1$s getting started?\n"
msgstr ""
-#: src/webex/pages/popup.tsx:265
+#: src/webex/pages/popup.tsx:264
#, c-format
msgid "%1$s incoming\n"
msgstr ""
-#: src/webex/pages/popup.tsx:278
+#: src/webex/pages/popup.tsx:277
#, c-format
msgid "%1$s being spent\n"
msgstr ""
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:303
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:342
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
" %2$s.\n"
msgstr ""
-#: src/webex/pages/popup.tsx:354
+#: src/webex/pages/popup.tsx:353
#, c-format
msgid ""
"Started to withdraw\n"
" %1$s from%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:363
#, c-format
msgid "Merchant%1$soffered contract%2$s;\n"
msgstr ""
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:373
#, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr ""
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:383
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
" (%3$s)\n"
msgstr ""
-#: src/webex/pages/popup.tsx:393
+#: src/webex/pages/popup.tsx:392
#, c-format
msgid "Unknown event (%1$s)"
msgstr ""
-#: src/webex/pages/popup.tsx:436
+#: src/webex/pages/popup.tsx:435
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
-#: src/webex/pages/popup.tsx:470
+#: src/webex/pages/popup.tsx:469
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""
-#: src/webex/renderHtml.tsx:49
+#: src/webex/renderHtml.tsx:51
#, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr ""
-#: src/webex/renderHtml.tsx:54
+#: src/webex/renderHtml.tsx:56
#, c-format
msgid "You are about to purchase:"
msgstr ""
diff --git a/src/webex/pages/confirm-contract.tsx
b/src/webex/pages/confirm-contract.tsx
index c4692cbf..fa71b102 100644
--- a/src/webex/pages/confirm-contract.tsx
+++ b/src/webex/pages/confirm-contract.tsx
@@ -107,6 +107,12 @@ interface ContractPromptState {
payDisabled: boolean;
alreadyPaid: boolean;
exchanges: null|ExchangeRecord[];
+ /**
+ * Don't request updates to proposal state while
+ * this is set to true, to avoid UI flickering
+ * when pressing pay.
+ */
+ holdCheck: boolean;
}
class ContractPrompt extends React.Component<ContractPromptProps,
ContractPromptState> {
@@ -118,6 +124,7 @@ class ContractPrompt extends
React.Component<ContractPromptProps, ContractPrompt
exchanges: null,
proposal: null,
payDisabled: true,
+ holdCheck: false,
};
}
@@ -138,6 +145,10 @@ class ContractPrompt extends
React.Component<ContractPromptProps, ContractPrompt
}
async checkPayment() {
+ window.setTimeout(() => this.checkPayment(), 500);
+ if (this.state.holdCheck) {
+ return;
+ }
const payStatus = await wxApi.checkPay(this.props.proposalId);
if (payStatus === "insufficient-balance") {
const msgInsufficient = i18n.str`You have insufficient funds of the
requested currency in your wallet.`;
@@ -160,11 +171,11 @@ class ContractPrompt extends
React.Component<ContractPromptProps, ContractPrompt
} else {
this.setState({payDisabled: false, error: null});
}
- window.setTimeout(() => this.checkPayment(), 500);
}
async doPayment() {
const proposal = this.state.proposal;
+ this.setState({holdCheck: true});
if (!proposal) {
return;
}
@@ -178,6 +189,7 @@ class ContractPrompt extends
React.Component<ContractPromptProps, ContractPrompt
document.location.href = proposal.contractTerms.fulfillment_url;
break;
}
+ this.setState({holdCheck: false});
}
diff --git a/src/webex/pages/confirm-create-reserve.tsx
b/src/webex/pages/confirm-create-reserve.tsx
index 6e1cc4a8..a695d935 100644
--- a/src/webex/pages/confirm-create-reserve.tsx
+++ b/src/webex/pages/confirm-create-reserve.tsx
@@ -22,7 +22,7 @@
* @author Florian Dold
*/
-import {amountToPretty, canonicalizeBaseUrl} from "../../helpers";
+import {canonicalizeBaseUrl} from "../../helpers";
import * as i18n from "../../i18n";
import {
AmountJson,
@@ -40,6 +40,8 @@ import {
getReserveCreationInfo,
} from "../wxApi";
+import {renderAmount} from "../renderHtml";
+
import * as React from "react";
import * as ReactDOM from "react-dom";
import URI = require("urijs");
@@ -163,10 +165,10 @@ function renderReserveCreationDetails(rci:
ReserveCreationInfo|null) {
return (
<tr>
<td>{countByPub[denom.denomPub] + "x"}</td>
- <td>{amountToPretty(denom.value)}</td>
- <td>{amountToPretty(denom.feeWithdraw)}</td>
- <td>{amountToPretty(denom.feeRefresh)}</td>
- <td>{amountToPretty(denom.feeDeposit)}</td>
+ <td>{renderAmount(denom.value)}</td>
+ <td>{renderAmount(denom.feeWithdraw)}</td>
+ <td>{renderAmount(denom.feeRefresh)}</td>
+ <td>{renderAmount(denom.feeDeposit)}</td>
</tr>
);
}
@@ -187,22 +189,22 @@ function renderReserveCreationDetails(rci:
ReserveCreationInfo|null) {
{rci!.wireFees.feesForType[s].map((f) => (
<tr>
<td>{moment.unix(f.endStamp).format("llll")}</td>
- <td>{amountToPretty(f.wireFee)}</td>
- <td>{amountToPretty(f.closingFee)}</td>
+ <td>{renderAmount(f.wireFee)}</td>
+ <td>{renderAmount(f.closingFee)}</td>
</tr>
))}
</tbody>,
];
}
- const withdrawFeeStr = amountToPretty(rci.withdrawFee);
- const overheadStr = amountToPretty(rci.overhead);
+ const withdrawFee = renderAmount(rci.withdrawFee);
+ const overhead = renderAmount(rci.overhead);
return (
<div>
<h3>Overview</h3>
- <p>{i18n.str`Withdrawal fees: ${withdrawFeeStr}`}</p>
- <p>{i18n.str`Rounding loss: ${overheadStr}`}</p>
+ <p>{i18n.str`Withdrawal fees:`} {withdrawFee}</p>
+ <p>{i18n.str`Rounding loss:`} {overhead}</p>
<p>{i18n.str`Earliest expiration (for deposit):
${moment.unix(rci.earliestDepositExpiration).fromNow()}`}</p>
<h3>Coin Fees</h3>
<table className="pure-table">
@@ -374,7 +376,7 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
Using exchange provider <strong>{this.url()}</strong>.
The exchange provider will charge
{" "}
- <span>{amountToPretty(totalCost)}</span>
+ <span>{renderAmount(totalCost)}</span>
{" "}
in fees.
</i18n.Translate>
@@ -476,7 +478,7 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
<div>
<i18n.Translate wrap="p">
{"You are about to withdraw "}
- <strong>{amountToPretty(this.props.amount)}</strong>
+ <strong>{renderAmount(this.props.amount)}</strong>
{" from your bank account into your wallet."}
</i18n.Translate>
{this.selectingExchange() ? this.renderSelect() : this.renderConfirm()}
diff --git a/src/webex/pages/payback.tsx b/src/webex/pages/payback.tsx
index 4aadf5ad..51ad8612 100644
--- a/src/webex/pages/payback.tsx
+++ b/src/webex/pages/payback.tsx
@@ -24,7 +24,7 @@
/**
* Imports.
*/
-import { amountToPretty } from "../../helpers";
+import { renderAmount } from "../renderHtml";
import {
ReserveRecord,
} from "../../types";
@@ -73,7 +73,7 @@ class Payback extends ImplicitStateComponent<any> {
<div>
{reserves.map((r) => (
<div>
- <h2>Reserve for ${amountToPretty(r.current_amount!)}</h2>
+ <h2>Reserve for ${renderAmount(r.current_amount!)}</h2>
<ul>
<li>Exchange: ${r.exchange_base_url}</li>
</ul>
diff --git a/src/webex/pages/popup.tsx b/src/webex/pages/popup.tsx
index 54e4f3e2..ee9c8023 100644
--- a/src/webex/pages/popup.tsx
+++ b/src/webex/pages/popup.tsx
@@ -25,7 +25,6 @@
/**
* Imports.
*/
-import { amountToPretty } from "../../helpers";
import * as i18n from "../../i18n";
import {
AmountJson,
@@ -36,7 +35,7 @@ import {
WalletBalanceEntry,
} from "../../types";
-import { abbrev } from "../renderHtml";
+import { abbrev, renderAmount } from "../renderHtml";
import * as React from "react";
import * as ReactDOM from "react-dom";
@@ -258,15 +257,15 @@ class WalletBalanceView extends React.Component<any, any>
{
let incoming: JSX.Element | undefined;
let payment: JSX.Element | undefined;
- console.log("available: ", entry.pendingIncoming ?
amountToPretty(entry.available) : null);
- console.log("incoming: ", entry.pendingIncoming ?
amountToPretty(entry.pendingIncoming) : null);
+ console.log("available: ", entry.pendingIncoming ?
renderAmount(entry.available) : null);
+ console.log("incoming: ", entry.pendingIncoming ?
renderAmount(entry.pendingIncoming) : null);
if (Amounts.isNonZero(entry.pendingIncoming)) {
incoming = (
<i18n.Translate wrap="span">
<span style={{color: "darkgreen"}}>
{"+"}
- {amountToPretty(entry.pendingIncoming)}
+ {renderAmount(entry.pendingIncoming)}
</span>
{" "}
incoming
@@ -278,7 +277,7 @@ class WalletBalanceView extends React.Component<any, any> {
payment = (
<i18n.Translate wrap="span">
<span style={{color: "darkblue"}}>
- {amountToPretty(entry.pendingPayment)}
+ {renderAmount(entry.pendingPayment)}
</span>
{" "}
being spent
@@ -344,7 +343,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
<i18n.Translate wrap="p">
Bank requested reserve (<span>{abbrev(d.reservePub)}</span>) for
{" "}
- <span>{amountToPretty(d.requestedAmount)}</span>.
+ <span>{renderAmount(d.requestedAmount)}</span>.
</i18n.Translate>
);
case "confirm-reserve": {
@@ -354,7 +353,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
return (
<i18n.Translate wrap="p">
Started to withdraw
- {" "}{amountToPretty(d.requestedAmount)}{" "}
+ {" "}{renderAmount(d.requestedAmount)}{" "}
from <span>{exchange}</span> (<span>{pub}</span>).
</i18n.Translate>
);
@@ -369,7 +368,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
}
case "depleted-reserve": {
const exchange = d.exchangeBaseUrl ? (new URI(d.exchangeBaseUrl)).host()
: "??";
- const amount = amountToPretty(d.requestedAmount);
+ const amount = renderAmount(d.requestedAmount);
const pub = abbrev(d.reservePub);
return (
<i18n.Translate wrap="p">
@@ -383,7 +382,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
const fulfillmentLinkElem = <a href={url} onClick={openTab(url)}>view
product</a>;
return (
<i18n.Translate wrap="p">
- Paid <span>{amountToPretty(d.amount)}</span> to merchant
<span>{merchantElem}</span>.
+ Paid <span>{renderAmount(d.amount)}</span> to merchant
<span>{merchantElem}</span>.
{" "}
(<span>{fulfillmentLinkElem}</span>)
</i18n.Translate>
diff --git a/src/webex/pages/tree.tsx b/src/webex/pages/tree.tsx
index 3eafbbeb..ad1693fb 100644
--- a/src/webex/pages/tree.tsx
+++ b/src/webex/pages/tree.tsx
@@ -21,7 +21,7 @@
*/
-import { amountToPretty, getTalerStampDate } from "../../helpers";
+import { getTalerStampDate } from "../../helpers";
import {
CoinRecord,
CoinStatus,
@@ -42,6 +42,8 @@ import {
refresh,
} from "../wxApi";
+import { renderAmount } from "../renderHtml";
+
import * as React from "react";
import * as ReactDOM from "react-dom";
@@ -57,8 +59,8 @@ class ReserveView extends React.Component<ReserveViewProps,
void> {
<ul>
<li>Key: {r.reserve_pub}</li>
<li>Created: {(new Date(r.created * 1000).toString())}</li>
- <li>Current: {r.current_amount ? amountToPretty(r.current_amount!) :
"null"}</li>
- <li>Requested: {amountToPretty(r.requested_amount)}</li>
+ <li>Current: {r.current_amount ? renderAmount(r.current_amount!) :
"null"}</li>
+ <li>Requested: {renderAmount(r.requested_amount)}</li>
<li>Confirmed: {r.confirmed}</li>
</ul>
</div>
@@ -135,7 +137,7 @@ class CoinView extends React.Component<CoinViewProps, void>
{
<div className="tree-item">
<ul>
<li>Key: {c.coinPub}</li>
- <li>Current amount: {amountToPretty(c.currentAmount)}</li>
+ <li>Current amount: {renderAmount(c.currentAmount)}</li>
<li>Denomination: <ExpanderText text={c.denomPub} /></li>
<li>Suspended: {(c.suspended || false).toString()}</li>
<li>Status: {CoinStatus[c.status]}</li>
@@ -304,11 +306,11 @@ class DenominationList extends
ImplicitStateComponent<DenominationListProps> {
<div className="tree-item">
<ul>
<li>Offered: {d.isOffered ? "yes" : "no"}</li>
- <li>Value: {amountToPretty(d.value)}</li>
- <li>Withdraw fee: {amountToPretty(d.feeWithdraw)}</li>
- <li>Refresh fee: {amountToPretty(d.feeRefresh)}</li>
- <li>Deposit fee: {amountToPretty(d.feeDeposit)}</li>
- <li>Refund fee: {amountToPretty(d.feeRefund)}</li>
+ <li>Value: {renderAmount(d.value)}</li>
+ <li>Withdraw fee: {renderAmount(d.feeWithdraw)}</li>
+ <li>Refresh fee: {renderAmount(d.feeRefresh)}</li>
+ <li>Deposit fee: {renderAmount(d.feeDeposit)}</li>
+ <li>Refund fee: {renderAmount(d.feeRefund)}</li>
<li>Start: {getTalerStampDate(d.stampStart)!.toString()}</li>
<li>Withdraw expiration:
{getTalerStampDate(d.stampExpireWithdraw)!.toString()}</li>
<li>Legal expiration:
{getTalerStampDate(d.stampExpireLegal)!.toString()}</li>
diff --git a/src/webex/renderHtml.tsx b/src/webex/renderHtml.tsx
index 4dd7bade..51f9019e 100644
--- a/src/webex/renderHtml.tsx
+++ b/src/webex/renderHtml.tsx
@@ -27,6 +27,8 @@
import { amountToPretty } from "../helpers";
import * as i18n from "../i18n";
import {
+ AmountJson,
+ Amounts,
ContractTerms,
} from "../types";
@@ -63,6 +65,16 @@ export function renderContractTerms(contractTerms:
ContractTerms): JSX.Element {
/**
+ * Render amount as HTML, which non-breaking space between
+ * decimal value and currency.
+ */
+export function renderAmount(amount: AmountJson) {
+ const x = amount.value + amount.fraction / Amounts.fractionalBase;
+ return <span>{x} {amount.currency}</span>;
+}
+
+
+/**
* Abbreviate a string to a given length, and show the full
* string on hover as a tooltip.
*/
--
To stop receiving notification emails like this one, please contact
address@hidden