taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

some UI fixes

Browse Source
This commit is contained in:
Florian Dold 2017-06-04 17:56:55 +02:00
parent e0e496b878
commit c88bcce998
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
12 changed files with 326 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/i18n/de.po
View File

@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:" msgid "Exchanges in the wallet:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:142 #: src/webex/pages/confirm-contract.tsx:154
#, c-format #, c-format
msgid "You have insufficient funds of the requested currency in your wallet." msgid "You have insufficient funds of the requested currency in your wallet."
msgstr "" msgstr ""
#. tslint:disable-next-line:max-line-length #. tslint:disable-next-line:max-line-length
#: src/webex/pages/confirm-contract.tsx:144 #: src/webex/pages/confirm-contract.tsx:156
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:204 #: src/webex/pages/confirm-create-reserve.tsx:206
#, fuzzy, c-format #, fuzzy, c-format
msgid "Withdrawal fees: %1$s" msgid "Withdrawal fees:"
msgstr "Abheben bei %1$s" msgstr "Abheben bei %1$s"
#: src/webex/pages/confirm-create-reserve.tsx:205 #: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format #, c-format
msgid "Rounding loss: %1$s" msgid "Rounding loss:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format #, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:211 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:212 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:215
#, fuzzy, c-format #, fuzzy, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "Abheben bei %1$s" msgstr "Abheben bei %1$s"
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:268 #: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:284 #: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:352 #: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:358 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:364 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:373 #: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,156 +132,156 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:387 #: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:398 #: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:404 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:416 #: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:421 #: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:477 #: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:560 #: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:571 #: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:585 #: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:592 #: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:161 #: src/webex/pages/popup.tsx:160
#, c-format #, c-format
msgid "Balance" msgid "Balance"
msgstr "Saldo" msgstr "Saldo"
#: src/webex/pages/popup.tsx:164 #: src/webex/pages/popup.tsx:163
#, c-format #, c-format
msgid "History" msgid "History"
msgstr "Verlauf" msgstr "Verlauf"
#: src/webex/pages/popup.tsx:167 #: src/webex/pages/popup.tsx:166
#, c-format #, c-format
msgid "Debug" msgid "Debug"
msgstr "Debug" msgstr "Debug"
#: src/webex/pages/popup.tsx:243 #: src/webex/pages/popup.tsx:242
#, c-format #, c-format
msgid "help" msgid "help"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:248 #: src/webex/pages/popup.tsx:247
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"You have no balance to show. Need some\n" "You have no balance to show. Need some\n"
" %1$s getting started?\n" " %1$s getting started?\n"
msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?" msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
#: src/webex/pages/popup.tsx:265 #: src/webex/pages/popup.tsx:264
#, c-format #, c-format
msgid "%1$s incoming\n" msgid "%1$s incoming\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:278 #: src/webex/pages/popup.tsx:277
#, c-format #, c-format
msgid "%1$s being spent\n" msgid "%1$s being spent\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:304 #: src/webex/pages/popup.tsx:303
#, c-format #, c-format
msgid "Error: could not retrieve balance information." msgid "Error: could not retrieve balance information."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:343 #: src/webex/pages/popup.tsx:342
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"Bank requested reserve (%1$s) for\n" "Bank requested reserve (%1$s) for\n"
" %2$s.\n" " %2$s.\n"
msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s" 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 #, fuzzy, c-format
msgid "" msgid ""
"Started to withdraw\n" "Started to withdraw\n"
" %1$s from%2$s(%3$s).\n" " %1$s from%2$s(%3$s).\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" 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 #, c-format
msgid "Merchant%1$soffered contract%2$s;\n" msgid "Merchant%1$soffered contract%2$s;\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:374 #: src/webex/pages/popup.tsx:373
#, fuzzy, c-format #, fuzzy, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n" msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" 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 #, fuzzy, c-format
msgid "" msgid ""
"Paid%1$sto merchant%2$s.\n" "Paid%1$sto merchant%2$s.\n"
" (%3$s)\n" " (%3$s)\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" 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 #, c-format
msgid "Unknown event (%1$s)" msgid "Unknown event (%1$s)"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:436 #: src/webex/pages/popup.tsx:435
#, c-format #, c-format
msgid "Error: could not retrieve event history" msgid "Error: could not retrieve event history"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:470 #: src/webex/pages/popup.tsx:469
#, c-format #, c-format
msgid "Your wallet has no events recorded." msgid "Your wallet has no events recorded."
msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse." msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
#: src/webex/renderHtml.tsx:49 #: src/webex/renderHtml.tsx:51
#, fuzzy, c-format #, fuzzy, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n" msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr "" msgstr ""
@ -289,13 +289,13 @@ msgstr ""
" möchte einen Vertrag über %2$s\n" " möchte einen Vertrag über %2$s\n"
" mit Ihnen abschließen." " mit Ihnen abschließen."
#: src/webex/renderHtml.tsx:54 #: src/webex/renderHtml.tsx:56
#, fuzzy, c-format #, fuzzy, c-format
msgid "You are about to purchase:" msgid "You are about to purchase:"
msgstr "Sie sind dabei, Folgendes zu kaufen:" msgstr "Sie sind dabei, Folgendes zu kaufen:"
#, fuzzy #, fuzzy
#~ msgid "Withdraw fees:" #~ msgid "Withdrawal fees: %1$s"
#~ msgstr "Abheben bei %1$s" #~ msgstr "Abheben bei %1$s"
#~ msgid "Confirm Payment" #~ msgid "Confirm Payment"

104
src/i18n/en-US.po
View File

@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:" msgid "Exchanges in the wallet:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:142 #: src/webex/pages/confirm-contract.tsx:154
#, c-format #, c-format
msgid "You have insufficient funds of the requested currency in your wallet." msgid "You have insufficient funds of the requested currency in your wallet."
msgstr "" msgstr ""
#. tslint:disable-next-line:max-line-length #. tslint:disable-next-line:max-line-length
#: src/webex/pages/confirm-contract.tsx:144 #: src/webex/pages/confirm-contract.tsx:156
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:204
#, c-format
msgid "Withdrawal fees: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:205
#, c-format
msgid "Rounding loss: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format #, c-format
msgid "Withdrawal fees:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
msgid "Rounding loss:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:211 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:212 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:268 #: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:284 #: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:352 #: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:358 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:364 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:373 #: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:387 #: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:398 #: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:404 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:416 #: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:421 #: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:477 #: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:560 #: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:571 #: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:585 #: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:592 #: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:161 #: src/webex/pages/popup.tsx:160
#, c-format #, c-format
msgid "Balance" msgid "Balance"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:164 #: src/webex/pages/popup.tsx:163
#, c-format #, c-format
msgid "History" msgid "History"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:167 #: src/webex/pages/popup.tsx:166
#, c-format #, c-format
msgid "Debug" msgid "Debug"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:243 #: src/webex/pages/popup.tsx:242
#, c-format #, c-format
msgid "help" msgid "help"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:248 #: src/webex/pages/popup.tsx:247
#, c-format #, c-format
msgid "" msgid ""
"You have no balance to show. Need some\n" "You have no balance to show. Need some\n"
" %1$s getting started?\n" " %1$s getting started?\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:265 #: src/webex/pages/popup.tsx:264
#, c-format #, c-format
msgid "%1$s incoming\n" msgid "%1$s incoming\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:278 #: src/webex/pages/popup.tsx:277
#, c-format #, c-format
msgid "%1$s being spent\n" msgid "%1$s being spent\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:304 #: src/webex/pages/popup.tsx:303
#, c-format #, c-format
msgid "Error: could not retrieve balance information." msgid "Error: could not retrieve balance information."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:343 #: src/webex/pages/popup.tsx:342
#, c-format #, c-format
msgid "" msgid ""
"Bank requested reserve (%1$s) for\n" "Bank requested reserve (%1$s) for\n"
" %2$s.\n" " %2$s.\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:354 #: src/webex/pages/popup.tsx:353
#, c-format #, c-format
msgid "" msgid ""
"Started to withdraw\n" "Started to withdraw\n"
" %1$s from%2$s(%3$s).\n" " %1$s from%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:364 #: src/webex/pages/popup.tsx:363
#, c-format #, c-format
msgid "Merchant%1$soffered contract%2$s;\n" msgid "Merchant%1$soffered contract%2$s;\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:374 #: src/webex/pages/popup.tsx:373
#, c-format #, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n" msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:384 #: src/webex/pages/popup.tsx:383
#, c-format #, c-format
msgid "" msgid ""
"Paid%1$sto merchant%2$s.\n" "Paid%1$sto merchant%2$s.\n"
" (%3$s)\n" " (%3$s)\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:393 #: src/webex/pages/popup.tsx:392
#, c-format #, c-format
msgid "Unknown event (%1$s)" msgid "Unknown event (%1$s)"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:436 #: src/webex/pages/popup.tsx:435
#, c-format #, c-format
msgid "Error: could not retrieve event history" msgid "Error: could not retrieve event history"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:470 #: src/webex/pages/popup.tsx:469
#, c-format #, c-format
msgid "Your wallet has no events recorded." msgid "Your wallet has no events recorded."
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:49 #: src/webex/renderHtml.tsx:51
#, c-format #, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n" msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:54 #: src/webex/renderHtml.tsx:56
#, c-format #, c-format
msgid "You are about to purchase:" msgid "You are about to purchase:"
msgstr "" msgstr ""

104
src/i18n/fr.po
View File

@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:" msgid "Exchanges in the wallet:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:142 #: src/webex/pages/confirm-contract.tsx:154
#, c-format #, c-format
msgid "You have insufficient funds of the requested currency in your wallet." msgid "You have insufficient funds of the requested currency in your wallet."
msgstr "" msgstr ""
#. tslint:disable-next-line:max-line-length #. tslint:disable-next-line:max-line-length
#: src/webex/pages/confirm-contract.tsx:144 #: src/webex/pages/confirm-contract.tsx:156
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:204
#, c-format
msgid "Withdrawal fees: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:205
#, c-format
msgid "Rounding loss: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format #, c-format
msgid "Withdrawal fees:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
msgid "Rounding loss:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:211 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:212 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:268 #: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:284 #: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:352 #: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:358 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:364 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:373 #: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:387 #: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:398 #: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:404 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:416 #: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:421 #: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:477 #: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:560 #: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:571 #: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:585 #: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:592 #: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:161 #: src/webex/pages/popup.tsx:160
#, c-format #, c-format
msgid "Balance" msgid "Balance"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:164 #: src/webex/pages/popup.tsx:163
#, c-format #, c-format
msgid "History" msgid "History"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:167 #: src/webex/pages/popup.tsx:166
#, c-format #, c-format
msgid "Debug" msgid "Debug"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:243 #: src/webex/pages/popup.tsx:242
#, c-format #, c-format
msgid "help" msgid "help"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:248 #: src/webex/pages/popup.tsx:247
#, c-format #, c-format
msgid "" msgid ""
"You have no balance to show. Need some\n" "You have no balance to show. Need some\n"
" %1$s getting started?\n" " %1$s getting started?\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:265 #: src/webex/pages/popup.tsx:264
#, c-format #, c-format
msgid "%1$s incoming\n" msgid "%1$s incoming\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:278 #: src/webex/pages/popup.tsx:277
#, c-format #, c-format
msgid "%1$s being spent\n" msgid "%1$s being spent\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:304 #: src/webex/pages/popup.tsx:303
#, c-format #, c-format
msgid "Error: could not retrieve balance information." msgid "Error: could not retrieve balance information."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:343 #: src/webex/pages/popup.tsx:342
#, c-format #, c-format
msgid "" msgid ""
"Bank requested reserve (%1$s) for\n" "Bank requested reserve (%1$s) for\n"
" %2$s.\n" " %2$s.\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:354 #: src/webex/pages/popup.tsx:353
#, c-format #, c-format
msgid "" msgid ""
"Started to withdraw\n" "Started to withdraw\n"
" %1$s from%2$s(%3$s).\n" " %1$s from%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:364 #: src/webex/pages/popup.tsx:363
#, c-format #, c-format
msgid "Merchant%1$soffered contract%2$s;\n" msgid "Merchant%1$soffered contract%2$s;\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:374 #: src/webex/pages/popup.tsx:373
#, c-format #, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n" msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:384 #: src/webex/pages/popup.tsx:383
#, c-format #, c-format
msgid "" msgid ""
"Paid%1$sto merchant%2$s.\n" "Paid%1$sto merchant%2$s.\n"
" (%3$s)\n" " (%3$s)\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:393 #: src/webex/pages/popup.tsx:392
#, c-format #, c-format
msgid "Unknown event (%1$s)" msgid "Unknown event (%1$s)"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:436 #: src/webex/pages/popup.tsx:435
#, c-format #, c-format
msgid "Error: could not retrieve event history" msgid "Error: could not retrieve event history"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:470 #: src/webex/pages/popup.tsx:469
#, c-format #, c-format
msgid "Your wallet has no events recorded." msgid "Your wallet has no events recorded."
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:49 #: src/webex/renderHtml.tsx:51
#, c-format #, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n" msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:54 #: src/webex/renderHtml.tsx:56
#, c-format #, c-format
msgid "You are about to purchase:" msgid "You are about to purchase:"
msgstr "" msgstr ""

104
src/i18n/it.po
View File

@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:" msgid "Exchanges in the wallet:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:142 #: src/webex/pages/confirm-contract.tsx:154
#, c-format #, c-format
msgid "You have insufficient funds of the requested currency in your wallet." msgid "You have insufficient funds of the requested currency in your wallet."
msgstr "" msgstr ""
#. tslint:disable-next-line:max-line-length #. tslint:disable-next-line:max-line-length
#: src/webex/pages/confirm-contract.tsx:144 #: src/webex/pages/confirm-contract.tsx:156
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:204
#, c-format
msgid "Withdrawal fees: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:205
#, c-format
msgid "Rounding loss: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format #, c-format
msgid "Withdrawal fees:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
msgid "Rounding loss:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:211 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:212 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:268 #: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:284 #: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:352 #: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:358 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:364 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:373 #: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:387 #: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:398 #: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:404 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:416 #: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:421 #: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:477 #: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:560 #: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:571 #: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:585 #: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:592 #: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:161 #: src/webex/pages/popup.tsx:160
#, c-format #, c-format
msgid "Balance" msgid "Balance"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:164 #: src/webex/pages/popup.tsx:163
#, c-format #, c-format
msgid "History" msgid "History"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:167 #: src/webex/pages/popup.tsx:166
#, c-format #, c-format
msgid "Debug" msgid "Debug"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:243 #: src/webex/pages/popup.tsx:242
#, c-format #, c-format
msgid "help" msgid "help"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:248 #: src/webex/pages/popup.tsx:247
#, c-format #, c-format
msgid "" msgid ""
"You have no balance to show. Need some\n" "You have no balance to show. Need some\n"
" %1$s getting started?\n" " %1$s getting started?\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:265 #: src/webex/pages/popup.tsx:264
#, c-format #, c-format
msgid "%1$s incoming\n" msgid "%1$s incoming\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:278 #: src/webex/pages/popup.tsx:277
#, c-format #, c-format
msgid "%1$s being spent\n" msgid "%1$s being spent\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:304 #: src/webex/pages/popup.tsx:303
#, c-format #, c-format
msgid "Error: could not retrieve balance information." msgid "Error: could not retrieve balance information."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:343 #: src/webex/pages/popup.tsx:342
#, c-format #, c-format
msgid "" msgid ""
"Bank requested reserve (%1$s) for\n" "Bank requested reserve (%1$s) for\n"
" %2$s.\n" " %2$s.\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:354 #: src/webex/pages/popup.tsx:353
#, c-format #, c-format
msgid "" msgid ""
"Started to withdraw\n" "Started to withdraw\n"
" %1$s from%2$s(%3$s).\n" " %1$s from%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:364 #: src/webex/pages/popup.tsx:363
#, c-format #, c-format
msgid "Merchant%1$soffered contract%2$s;\n" msgid "Merchant%1$soffered contract%2$s;\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:374 #: src/webex/pages/popup.tsx:373
#, c-format #, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n" msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:384 #: src/webex/pages/popup.tsx:383
#, c-format #, c-format
msgid "" msgid ""
"Paid%1$sto merchant%2$s.\n" "Paid%1$sto merchant%2$s.\n"
" (%3$s)\n" " (%3$s)\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:393 #: src/webex/pages/popup.tsx:392
#, c-format #, c-format
msgid "Unknown event (%1$s)" msgid "Unknown event (%1$s)"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:436 #: src/webex/pages/popup.tsx:435
#, c-format #, c-format
msgid "Error: could not retrieve event history" msgid "Error: could not retrieve event history"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:470 #: src/webex/pages/popup.tsx:469
#, c-format #, c-format
msgid "Your wallet has no events recorded." msgid "Your wallet has no events recorded."
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:49 #: src/webex/renderHtml.tsx:51
#, c-format #, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n" msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:54 #: src/webex/renderHtml.tsx:56
#, c-format #, c-format
msgid "You are about to purchase:" msgid "You are about to purchase:"
msgstr "" msgstr ""

16
src/i18n/strings.ts
View File

@ -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.": [ "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" "Abheben bei %1$s"
], ],
"Rounding loss: %1$s": [ "Rounding loss:": [
"" ""
], ],
"Earliest expiration (for deposit): %1$s": [ "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.": [ "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": [ "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.": [ "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": [ "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.": [ "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": [ "Earliest expiration (for deposit): %1$s": [

104
src/i18n/taler-wallet-webex.pot
View File

@ -42,13 +42,13 @@ msgstr ""
msgid "Exchanges in the wallet:" msgid "Exchanges in the wallet:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:142 #: src/webex/pages/confirm-contract.tsx:154
#, c-format #, c-format
msgid "You have insufficient funds of the requested currency in your wallet." msgid "You have insufficient funds of the requested currency in your wallet."
msgstr "" msgstr ""
#. tslint:disable-next-line:max-line-length #. tslint:disable-next-line:max-line-length
#: src/webex/pages/confirm-contract.tsx:144 #: src/webex/pages/confirm-contract.tsx:156
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:204
#, c-format
msgid "Withdrawal fees: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:205
#, c-format
msgid "Rounding loss: %1$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:206
#, c-format #, c-format
msgid "Withdrawal fees:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207
#, c-format
msgid "Rounding loss:"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208
#, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:211 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:212 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:215
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:217
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:268 #: src/webex/pages/confirm-create-reserve.tsx:270
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:284 #: src/webex/pages/confirm-create-reserve.tsx:286
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:352 #: src/webex/pages/confirm-create-reserve.tsx:354
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:358 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:364 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:373 #: src/webex/pages/confirm-create-reserve.tsx:375
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,161 +132,161 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:387 #: src/webex/pages/confirm-create-reserve.tsx:389
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:398 #: src/webex/pages/confirm-create-reserve.tsx:400
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:404 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:416 #: src/webex/pages/confirm-create-reserve.tsx:418
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:421 #: src/webex/pages/confirm-create-reserve.tsx:423
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:477 #: src/webex/pages/confirm-create-reserve.tsx:479
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:560 #: src/webex/pages/confirm-create-reserve.tsx:562
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:571 #: src/webex/pages/confirm-create-reserve.tsx:573
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:585 #: src/webex/pages/confirm-create-reserve.tsx:587
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:592 #: src/webex/pages/confirm-create-reserve.tsx:594
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:161 #: src/webex/pages/popup.tsx:160
#, c-format #, c-format
msgid "Balance" msgid "Balance"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:164 #: src/webex/pages/popup.tsx:163
#, c-format #, c-format
msgid "History" msgid "History"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:167 #: src/webex/pages/popup.tsx:166
#, c-format #, c-format
msgid "Debug" msgid "Debug"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:243 #: src/webex/pages/popup.tsx:242
#, c-format #, c-format
msgid "help" msgid "help"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:248 #: src/webex/pages/popup.tsx:247
#, c-format #, c-format
msgid "" msgid ""
"You have no balance to show. Need some\n" "You have no balance to show. Need some\n"
" %1$s getting started?\n" " %1$s getting started?\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:265 #: src/webex/pages/popup.tsx:264
#, c-format #, c-format
msgid "%1$s incoming\n" msgid "%1$s incoming\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:278 #: src/webex/pages/popup.tsx:277
#, c-format #, c-format
msgid "%1$s being spent\n" msgid "%1$s being spent\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:304 #: src/webex/pages/popup.tsx:303
#, c-format #, c-format
msgid "Error: could not retrieve balance information." msgid "Error: could not retrieve balance information."
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:343 #: src/webex/pages/popup.tsx:342
#, c-format #, c-format
msgid "" msgid ""
"Bank requested reserve (%1$s) for\n" "Bank requested reserve (%1$s) for\n"
" %2$s.\n" " %2$s.\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:354 #: src/webex/pages/popup.tsx:353
#, c-format #, c-format
msgid "" msgid ""
"Started to withdraw\n" "Started to withdraw\n"
" %1$s from%2$s(%3$s).\n" " %1$s from%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:364 #: src/webex/pages/popup.tsx:363
#, c-format #, c-format
msgid "Merchant%1$soffered contract%2$s;\n" msgid "Merchant%1$soffered contract%2$s;\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:374 #: src/webex/pages/popup.tsx:373
#, c-format #, c-format
msgid "Withdrew%1$sfrom%2$s(%3$s).\n" msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:384 #: src/webex/pages/popup.tsx:383
#, c-format #, c-format
msgid "" msgid ""
"Paid%1$sto merchant%2$s.\n" "Paid%1$sto merchant%2$s.\n"
" (%3$s)\n" " (%3$s)\n"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:393 #: src/webex/pages/popup.tsx:392
#, c-format #, c-format
msgid "Unknown event (%1$s)" msgid "Unknown event (%1$s)"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:436 #: src/webex/pages/popup.tsx:435
#, c-format #, c-format
msgid "Error: could not retrieve event history" msgid "Error: could not retrieve event history"
msgstr "" msgstr ""
#: src/webex/pages/popup.tsx:470 #: src/webex/pages/popup.tsx:469
#, c-format #, c-format
msgid "Your wallet has no events recorded." msgid "Your wallet has no events recorded."
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:49 #: src/webex/renderHtml.tsx:51
#, c-format #, c-format
msgid "The merchant%1$swants to enter a contract over%2$s with you.\n" msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
msgstr "" msgstr ""
#: src/webex/renderHtml.tsx:54 #: src/webex/renderHtml.tsx:56
#, c-format #, c-format
msgid "You are about to purchase:" msgid "You are about to purchase:"
msgstr "" msgstr ""

14
src/webex/pages/confirm-contract.tsx
View File

@ -107,6 +107,12 @@ interface ContractPromptState {
payDisabled: boolean; payDisabled: boolean;
alreadyPaid: boolean; alreadyPaid: boolean;
exchanges: null|ExchangeRecord[]; 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> { class ContractPrompt extends React.Component<ContractPromptProps, ContractPromptState> {
@ -118,6 +124,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
exchanges: null, exchanges: null,
proposal: null, proposal: null,
payDisabled: true, payDisabled: true,
holdCheck: false,
}; };
} }
@ -138,6 +145,10 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
} }
async checkPayment() { async checkPayment() {
window.setTimeout(() => this.checkPayment(), 500);
if (this.state.holdCheck) {
return;
}
const payStatus = await wxApi.checkPay(this.props.proposalId); const payStatus = await wxApi.checkPay(this.props.proposalId);
if (payStatus === "insufficient-balance") { if (payStatus === "insufficient-balance") {
const msgInsufficient = i18n.str`You have insufficient funds of the requested currency in your wallet.`; 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 { } else {
this.setState({payDisabled: false, error: null}); this.setState({payDisabled: false, error: null});
} }
window.setTimeout(() => this.checkPayment(), 500);
} }
async doPayment() { async doPayment() {
const proposal = this.state.proposal; const proposal = this.state.proposal;
this.setState({holdCheck: true});
if (!proposal) { if (!proposal) {
return; return;
} }
@ -178,6 +189,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
document.location.href = proposal.contractTerms.fulfillment_url; document.location.href = proposal.contractTerms.fulfillment_url;
break; break;
} }
this.setState({holdCheck: false});
} }

28
src/webex/pages/confirm-create-reserve.tsx
View File

@ -22,7 +22,7 @@
* @author Florian Dold * @author Florian Dold
*/ */
import {amountToPretty, canonicalizeBaseUrl} from "../../helpers"; import {canonicalizeBaseUrl} from "../../helpers";
import * as i18n from "../../i18n"; import * as i18n from "../../i18n";
import { import {
AmountJson, AmountJson,
@ -40,6 +40,8 @@ import {
getReserveCreationInfo, getReserveCreationInfo,
} from "../wxApi"; } from "../wxApi";
import {renderAmount} from "../renderHtml";
import * as React from "react"; import * as React from "react";
import * as ReactDOM from "react-dom"; import * as ReactDOM from "react-dom";
import URI = require("urijs"); import URI = require("urijs");
@ -163,10 +165,10 @@ function renderReserveCreationDetails(rci: ReserveCreationInfo|null) {
return ( return (
<tr> <tr>
<td>{countByPub[denom.denomPub] + "x"}</td> <td>{countByPub[denom.denomPub] + "x"}</td>
<td>{amountToPretty(denom.value)}</td> <td>{renderAmount(denom.value)}</td>
<td>{amountToPretty(denom.feeWithdraw)}</td> <td>{renderAmount(denom.feeWithdraw)}</td>
<td>{amountToPretty(denom.feeRefresh)}</td> <td>{renderAmount(denom.feeRefresh)}</td>
<td>{amountToPretty(denom.feeDeposit)}</td> <td>{renderAmount(denom.feeDeposit)}</td>
</tr> </tr>
); );
} }
@ -187,22 +189,22 @@ function renderReserveCreationDetails(rci: ReserveCreationInfo|null) {
{rci!.wireFees.feesForType[s].map((f) => ( {rci!.wireFees.feesForType[s].map((f) => (
<tr> <tr>
<td>{moment.unix(f.endStamp).format("llll")}</td> <td>{moment.unix(f.endStamp).format("llll")}</td>
<td>{amountToPretty(f.wireFee)}</td> <td>{renderAmount(f.wireFee)}</td>
<td>{amountToPretty(f.closingFee)}</td> <td>{renderAmount(f.closingFee)}</td>
</tr> </tr>
))} ))}
</tbody>, </tbody>,
]; ];
} }
const withdrawFeeStr = amountToPretty(rci.withdrawFee); const withdrawFee = renderAmount(rci.withdrawFee);
const overheadStr = amountToPretty(rci.overhead); const overhead = renderAmount(rci.overhead);
return ( return (
<div> <div>
<h3>Overview</h3> <h3>Overview</h3>
<p>{i18n.str`Withdrawal fees: ${withdrawFeeStr}`}</p> <p>{i18n.str`Withdrawal fees:`} {withdrawFee}</p>
<p>{i18n.str`Rounding loss: ${overheadStr}`}</p> <p>{i18n.str`Rounding loss:`} {overhead}</p>
<p>{i18n.str`Earliest expiration (for deposit): ${moment.unix(rci.earliestDepositExpiration).fromNow()}`}</p> <p>{i18n.str`Earliest expiration (for deposit): ${moment.unix(rci.earliestDepositExpiration).fromNow()}`}</p>
<h3>Coin Fees</h3> <h3>Coin Fees</h3>
<table className="pure-table"> <table className="pure-table">
@ -374,7 +376,7 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> {
Using exchange provider <strong>{this.url()}</strong>. Using exchange provider <strong>{this.url()}</strong>.
The exchange provider will charge The exchange provider will charge
{" "} {" "}
<span>{amountToPretty(totalCost)}</span> <span>{renderAmount(totalCost)}</span>
{" "} {" "}
in fees. in fees.
</i18n.Translate> </i18n.Translate>
@ -476,7 +478,7 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> {
<div> <div>
<i18n.Translate wrap="p"> <i18n.Translate wrap="p">
{"You are about to withdraw "} {"You are about to withdraw "}
<strong>{amountToPretty(this.props.amount)}</strong> <strong>{renderAmount(this.props.amount)}</strong>
{" from your bank account into your wallet."} {" from your bank account into your wallet."}
</i18n.Translate> </i18n.Translate>
{this.selectingExchange() ? this.renderSelect() : this.renderConfirm()} {this.selectingExchange() ? this.renderSelect() : this.renderConfirm()}

4
src/webex/pages/payback.tsx
View File

@ -24,7 +24,7 @@
/** /**
* Imports. * Imports.
*/ */
import { amountToPretty } from "../../helpers"; import { renderAmount } from "../renderHtml";
import { import {
ReserveRecord, ReserveRecord,
} from "../../types"; } from "../../types";
@ -73,7 +73,7 @@ class Payback extends ImplicitStateComponent<any> {
<div> <div>
{reserves.map((r) => ( {reserves.map((r) => (
<div> <div>
<h2>Reserve for ${amountToPretty(r.current_amount!)}</h2> <h2>Reserve for ${renderAmount(r.current_amount!)}</h2>
<ul> <ul>
<li>Exchange: ${r.exchange_base_url}</li> <li>Exchange: ${r.exchange_base_url}</li>
</ul> </ul>

19
src/webex/pages/popup.tsx
View File

@ -25,7 +25,6 @@
/** /**
* Imports. * Imports.
*/ */
import { amountToPretty } from "../../helpers";
import * as i18n from "../../i18n"; import * as i18n from "../../i18n";
import { import {
AmountJson, AmountJson,
@ -36,7 +35,7 @@ import {
WalletBalanceEntry, WalletBalanceEntry,
} from "../../types"; } from "../../types";
import { abbrev } from "../renderHtml"; import { abbrev, renderAmount } from "../renderHtml";
import * as React from "react"; import * as React from "react";
import * as ReactDOM from "react-dom"; import * as ReactDOM from "react-dom";
@ -258,15 +257,15 @@ class WalletBalanceView extends React.Component<any, any> {
let incoming: JSX.Element | undefined; let incoming: JSX.Element | undefined;
let payment: JSX.Element | undefined; let payment: JSX.Element | undefined;
console.log("available: ", entry.pendingIncoming ? amountToPretty(entry.available) : null); console.log("available: ", entry.pendingIncoming ? renderAmount(entry.available) : null);
console.log("incoming: ", entry.pendingIncoming ? amountToPretty(entry.pendingIncoming) : null); console.log("incoming: ", entry.pendingIncoming ? renderAmount(entry.pendingIncoming) : null);
if (Amounts.isNonZero(entry.pendingIncoming)) { if (Amounts.isNonZero(entry.pendingIncoming)) {
incoming = ( incoming = (
<i18n.Translate wrap="span"> <i18n.Translate wrap="span">
<span style={{color: "darkgreen"}}> <span style={{color: "darkgreen"}}>
{"+"} {"+"}
{amountToPretty(entry.pendingIncoming)} {renderAmount(entry.pendingIncoming)}
</span> </span>
{" "} {" "}
incoming incoming
@ -278,7 +277,7 @@ class WalletBalanceView extends React.Component<any, any> {
payment = ( payment = (
<i18n.Translate wrap="span"> <i18n.Translate wrap="span">
<span style={{color: "darkblue"}}> <span style={{color: "darkblue"}}>
{amountToPretty(entry.pendingPayment)} {renderAmount(entry.pendingPayment)}
</span> </span>
{" "} {" "}
being spent being spent
@ -344,7 +343,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
<i18n.Translate wrap="p"> <i18n.Translate wrap="p">
Bank requested reserve (<span>{abbrev(d.reservePub)}</span>) for Bank requested reserve (<span>{abbrev(d.reservePub)}</span>) for
{" "} {" "}
<span>{amountToPretty(d.requestedAmount)}</span>. <span>{renderAmount(d.requestedAmount)}</span>.
</i18n.Translate> </i18n.Translate>
); );
case "confirm-reserve": { case "confirm-reserve": {
@ -354,7 +353,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
return ( return (
<i18n.Translate wrap="p"> <i18n.Translate wrap="p">
Started to withdraw Started to withdraw
{" "}{amountToPretty(d.requestedAmount)}{" "} {" "}{renderAmount(d.requestedAmount)}{" "}
from <span>{exchange}</span> (<span>{pub}</span>). from <span>{exchange}</span> (<span>{pub}</span>).
</i18n.Translate> </i18n.Translate>
); );
@ -369,7 +368,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
} }
case "depleted-reserve": { case "depleted-reserve": {
const exchange = d.exchangeBaseUrl ? (new URI(d.exchangeBaseUrl)).host() : "??"; const exchange = d.exchangeBaseUrl ? (new URI(d.exchangeBaseUrl)).host() : "??";
const amount = amountToPretty(d.requestedAmount); const amount = renderAmount(d.requestedAmount);
const pub = abbrev(d.reservePub); const pub = abbrev(d.reservePub);
return ( return (
<i18n.Translate wrap="p"> <i18n.Translate wrap="p">
@ -383,7 +382,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
const fulfillmentLinkElem = <a href={url} onClick={openTab(url)}>view product</a>; const fulfillmentLinkElem = <a href={url} onClick={openTab(url)}>view product</a>;
return ( return (
<i18n.Translate wrap="p"> <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>) (<span>{fulfillmentLinkElem}</span>)
</i18n.Translate> </i18n.Translate>

20
src/webex/pages/tree.tsx
View File

@ -21,7 +21,7 @@
*/ */
import { amountToPretty, getTalerStampDate } from "../../helpers"; import { getTalerStampDate } from "../../helpers";
import { import {
CoinRecord, CoinRecord,
CoinStatus, CoinStatus,
@ -42,6 +42,8 @@ import {
refresh, refresh,
} from "../wxApi"; } from "../wxApi";
import { renderAmount } from "../renderHtml";
import * as React from "react"; import * as React from "react";
import * as ReactDOM from "react-dom"; import * as ReactDOM from "react-dom";
@ -57,8 +59,8 @@ class ReserveView extends React.Component<ReserveViewProps, void> {
<ul> <ul>
<li>Key: {r.reserve_pub}</li> <li>Key: {r.reserve_pub}</li>
<li>Created: {(new Date(r.created * 1000).toString())}</li> <li>Created: {(new Date(r.created * 1000).toString())}</li>
<li>Current: {r.current_amount ? amountToPretty(r.current_amount!) : "null"}</li> <li>Current: {r.current_amount ? renderAmount(r.current_amount!) : "null"}</li>
<li>Requested: {amountToPretty(r.requested_amount)}</li> <li>Requested: {renderAmount(r.requested_amount)}</li>
<li>Confirmed: {r.confirmed}</li> <li>Confirmed: {r.confirmed}</li>
</ul> </ul>
</div> </div>
@ -135,7 +137,7 @@ class CoinView extends React.Component<CoinViewProps, void> {
<div className="tree-item"> <div className="tree-item">
<ul> <ul>
<li>Key: {c.coinPub}</li> <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>Denomination: <ExpanderText text={c.denomPub} /></li>
<li>Suspended: {(c.suspended || false).toString()}</li> <li>Suspended: {(c.suspended || false).toString()}</li>
<li>Status: {CoinStatus[c.status]}</li> <li>Status: {CoinStatus[c.status]}</li>
@ -304,11 +306,11 @@ class DenominationList extends ImplicitStateComponent<DenominationListProps> {
<div className="tree-item"> <div className="tree-item">
<ul> <ul>
<li>Offered: {d.isOffered ? "yes" : "no"}</li> <li>Offered: {d.isOffered ? "yes" : "no"}</li>
<li>Value: {amountToPretty(d.value)}</li> <li>Value: {renderAmount(d.value)}</li>
<li>Withdraw fee: {amountToPretty(d.feeWithdraw)}</li> <li>Withdraw fee: {renderAmount(d.feeWithdraw)}</li>
<li>Refresh fee: {amountToPretty(d.feeRefresh)}</li> <li>Refresh fee: {renderAmount(d.feeRefresh)}</li>
<li>Deposit fee: {amountToPretty(d.feeDeposit)}</li> <li>Deposit fee: {renderAmount(d.feeDeposit)}</li>
<li>Refund fee: {amountToPretty(d.feeRefund)}</li> <li>Refund fee: {renderAmount(d.feeRefund)}</li>
<li>Start: {getTalerStampDate(d.stampStart)!.toString()}</li> <li>Start: {getTalerStampDate(d.stampStart)!.toString()}</li>
<li>Withdraw expiration: {getTalerStampDate(d.stampExpireWithdraw)!.toString()}</li> <li>Withdraw expiration: {getTalerStampDate(d.stampExpireWithdraw)!.toString()}</li>
<li>Legal expiration: {getTalerStampDate(d.stampExpireLegal)!.toString()}</li> <li>Legal expiration: {getTalerStampDate(d.stampExpireLegal)!.toString()}</li>

12
src/webex/renderHtml.tsx
View File

@ -27,6 +27,8 @@
import { amountToPretty } from "../helpers"; import { amountToPretty } from "../helpers";
import * as i18n from "../i18n"; import * as i18n from "../i18n";
import { import {
AmountJson,
Amounts,
ContractTerms, ContractTerms,
} from "../types"; } from "../types";
@ -62,6 +64,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}&nbsp;{amount.currency}</span>;
}
/** /**
* Abbreviate a string to a given length, and show the full * Abbreviate a string to a given length, and show the full
* string on hover as a tooltip. * string on hover as a tooltip.