[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-wallet-webex] branch master updated (d9683861 -> d08
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-wallet-webex] branch master updated (d9683861 -> d088c750) |
|
Date: |
Mon, 05 Feb 2018 13:26:15 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository wallet-webex.
from d9683861 fix performance and UI issues with tipping
new 4e30e1e0 manifest version
new d088c750 count coins being spent properly
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
manifest.json | 4 ++--
src/i18n/de.po | 27 ++++++++++++++++-----------
src/i18n/en-US.po | 27 ++++++++++++++++-----------
src/i18n/fr.po | 27 ++++++++++++++++-----------
src/i18n/it.po | 27 ++++++++++++++++-----------
src/i18n/strings.ts | 12 ++++++++++++
src/i18n/taler-wallet-webex.pot | 27 ++++++++++++++++-----------
src/wallet.ts | 2 +-
src/webex/pages/popup.tsx | 3 ++-
9 files changed, 97 insertions(+), 59 deletions(-)
diff --git a/manifest.json b/manifest.json
index 1e797602..271cceeb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,8 +4,8 @@
"name": "GNU Taler Wallet (git)",
"description": "Privacy preserving and transparent payments",
"author": "GNU Taler Developers",
- "version": "0.6.52",
- "version_name": "0.5.0-pre4",
+ "version": "0.6.53",
+ "version_name": "0.5.0-pre6",
"minimum_chrome_version": "51",
"minimum_opera_version": "36",
diff --git a/src/i18n/de.po b/src/i18n/de.po
index 398fdfab..37748180 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -27,28 +27,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/webex/pages/confirm-contract.tsx:74
+#: src/webex/pages/confirm-contract.tsx:76
#, c-format
msgid "show more details\n"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:90
#, c-format
msgid "Accepted exchanges:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:93
+#: src/webex/pages/confirm-contract.tsx:95
#, c-format
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:211
+#: src/webex/pages/confirm-contract.tsx:217
#, 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:213
+#: src/webex/pages/confirm-contract.tsx:219
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,31 +56,36 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:305
+#: src/webex/pages/confirm-contract.tsx:320
#, fuzzy, c-format
msgid "Confirm payment"
msgstr "Bezahlung bestätigen"
-#: src/webex/pages/confirm-contract.tsx:314
+#: src/webex/pages/confirm-contract.tsx:330
#, c-format
msgid "Submitting payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:349
+#: src/webex/pages/confirm-contract.tsx:372
#, c-format
msgid "The merchant%1$s offers you to purchase:\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:126
+#: src/webex/pages/confirm-create-reserve.tsx:128
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:142
+#: src/webex/pages/confirm-create-reserve.tsx:145
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:160
+#, c-format
+msgid "Invalid exchange URL (%1$s)"
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
msgid "The exchange is trusted by the wallet.\n"
@@ -159,7 +164,7 @@ msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:153
+#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 68faa6ba..c56d57f4 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -27,28 +27,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/webex/pages/confirm-contract.tsx:74
+#: src/webex/pages/confirm-contract.tsx:76
#, c-format
msgid "show more details\n"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:90
#, c-format
msgid "Accepted exchanges:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:93
+#: src/webex/pages/confirm-contract.tsx:95
#, c-format
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:211
+#: src/webex/pages/confirm-contract.tsx:217
#, 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:213
+#: src/webex/pages/confirm-contract.tsx:219
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,31 +56,36 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:305
+#: src/webex/pages/confirm-contract.tsx:320
#, c-format
msgid "Confirm payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:314
+#: src/webex/pages/confirm-contract.tsx:330
#, c-format
msgid "Submitting payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:349
+#: src/webex/pages/confirm-contract.tsx:372
#, c-format
msgid "The merchant%1$s offers you to purchase:\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:126
+#: src/webex/pages/confirm-create-reserve.tsx:128
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:142
+#: src/webex/pages/confirm-create-reserve.tsx:145
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:160
+#, c-format
+msgid "Invalid exchange URL (%1$s)"
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
msgid "The exchange is trusted by the wallet.\n"
@@ -159,7 +164,7 @@ msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:153
+#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 93077fb3..b5b7259e 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -27,28 +27,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/webex/pages/confirm-contract.tsx:74
+#: src/webex/pages/confirm-contract.tsx:76
#, c-format
msgid "show more details\n"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:90
#, c-format
msgid "Accepted exchanges:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:93
+#: src/webex/pages/confirm-contract.tsx:95
#, c-format
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:211
+#: src/webex/pages/confirm-contract.tsx:217
#, 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:213
+#: src/webex/pages/confirm-contract.tsx:219
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,31 +56,36 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:305
+#: src/webex/pages/confirm-contract.tsx:320
#, c-format
msgid "Confirm payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:314
+#: src/webex/pages/confirm-contract.tsx:330
#, c-format
msgid "Submitting payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:349
+#: src/webex/pages/confirm-contract.tsx:372
#, c-format
msgid "The merchant%1$s offers you to purchase:\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:126
+#: src/webex/pages/confirm-create-reserve.tsx:128
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:142
+#: src/webex/pages/confirm-create-reserve.tsx:145
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:160
+#, c-format
+msgid "Invalid exchange URL (%1$s)"
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
msgid "The exchange is trusted by the wallet.\n"
@@ -159,7 +164,7 @@ msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:153
+#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index 93077fb3..b5b7259e 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -27,28 +27,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/webex/pages/confirm-contract.tsx:74
+#: src/webex/pages/confirm-contract.tsx:76
#, c-format
msgid "show more details\n"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:90
#, c-format
msgid "Accepted exchanges:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:93
+#: src/webex/pages/confirm-contract.tsx:95
#, c-format
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:211
+#: src/webex/pages/confirm-contract.tsx:217
#, 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:213
+#: src/webex/pages/confirm-contract.tsx:219
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,31 +56,36 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:305
+#: src/webex/pages/confirm-contract.tsx:320
#, c-format
msgid "Confirm payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:314
+#: src/webex/pages/confirm-contract.tsx:330
#, c-format
msgid "Submitting payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:349
+#: src/webex/pages/confirm-contract.tsx:372
#, c-format
msgid "The merchant%1$s offers you to purchase:\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:126
+#: src/webex/pages/confirm-create-reserve.tsx:128
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:142
+#: src/webex/pages/confirm-create-reserve.tsx:145
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:160
+#, c-format
+msgid "Invalid exchange URL (%1$s)"
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
msgid "The exchange is trusted by the wallet.\n"
@@ -159,7 +164,7 @@ msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:153
+#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 072bd953..fa31de48 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -54,6 +54,9 @@ strings['de'] = {
"Error: URL may not be relative": [
""
],
+ "Invalid exchange URL (%1$s)": [
+ ""
+ ],
"The exchange is trusted by the wallet.\n": [
""
],
@@ -246,6 +249,9 @@ strings['en-US'] = {
"Error: URL may not be relative": [
""
],
+ "Invalid exchange URL (%1$s)": [
+ ""
+ ],
"The exchange is trusted by the wallet.\n": [
""
],
@@ -438,6 +444,9 @@ strings['fr'] = {
"Error: URL may not be relative": [
""
],
+ "Invalid exchange URL (%1$s)": [
+ ""
+ ],
"The exchange is trusted by the wallet.\n": [
""
],
@@ -630,6 +639,9 @@ strings['it'] = {
"Error: URL may not be relative": [
""
],
+ "Invalid exchange URL (%1$s)": [
+ ""
+ ],
"The exchange is trusted by the wallet.\n": [
""
],
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index 93077fb3..b5b7259e 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -27,28 +27,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/webex/pages/confirm-contract.tsx:74
+#: src/webex/pages/confirm-contract.tsx:76
#, c-format
msgid "show more details\n"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:90
#, c-format
msgid "Accepted exchanges:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:93
+#: src/webex/pages/confirm-contract.tsx:95
#, c-format
msgid "Exchanges in the wallet:"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:211
+#: src/webex/pages/confirm-contract.tsx:217
#, 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:213
+#: src/webex/pages/confirm-contract.tsx:219
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
@@ -56,31 +56,36 @@ msgid ""
"wallet."
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:305
+#: src/webex/pages/confirm-contract.tsx:320
#, c-format
msgid "Confirm payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:314
+#: src/webex/pages/confirm-contract.tsx:330
#, c-format
msgid "Submitting payment"
msgstr ""
-#: src/webex/pages/confirm-contract.tsx:349
+#: src/webex/pages/confirm-contract.tsx:372
#, c-format
msgid "The merchant%1$s offers you to purchase:\n"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:126
+#: src/webex/pages/confirm-create-reserve.tsx:128
#, c-format
msgid "Select"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:142
+#: src/webex/pages/confirm-create-reserve.tsx:145
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:160
+#, c-format
+msgid "Invalid exchange URL (%1$s)"
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
msgid "The exchange is trusted by the wallet.\n"
@@ -159,7 +164,7 @@ msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:153
+#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
diff --git a/src/wallet.ts b/src/wallet.ts
index 95e7246f..7c8aa772 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -1849,7 +1849,7 @@ export class Wallet {
return balance;
}
for (const c of t.payReq.coins) {
- addTo(balance, "pendingIncoming",
Amounts.parseOrThrow(c.contribution), c.exchange_url);
+ addTo(balance, "pendingPayment", Amounts.parseOrThrow(c.contribution),
c.exchange_url);
}
return balance;
}
diff --git a/src/webex/pages/popup.tsx b/src/webex/pages/popup.tsx
index 134ee6de..6bba1014 100644
--- a/src/webex/pages/popup.tsx
+++ b/src/webex/pages/popup.tsx
@@ -282,7 +282,8 @@ class WalletBalanceView extends React.Component<any, any> {
if (Amounts.isNonZero(entry.pendingPayment)) {
payment = (
<i18n.Translate wrap="span">
- <span style={{color: "darkblue"}}>
+ <span style={{color: "red"}}>
+ {"-"}
{renderAmount(entry.pendingPayment)}
</span>
{" "}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-wallet-webex] branch master updated (d9683861 -> d088c750),
gnunet <=