[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-wallet-webex] branch master updated: fix history ren
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-wallet-webex] branch master updated: fix history rendering issue caused by i18n |
|
Date: |
Tue, 17 Oct 2017 12:07:37 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-webex.
The following commit(s) were added to refs/heads/master by this push:
new 49554544 fix history rendering issue caused by i18n
49554544 is described below
commit 4955454440079f3beeaf0cbb7fb8bf82c113b231
Author: Florian Dold <address@hidden>
AuthorDate: Tue Oct 17 12:06:47 2017 +0200
fix history rendering issue caused by i18n
---
src/i18n/de.po | 6 +++---
src/i18n/en-US.po | 6 +++---
src/i18n/fr.po | 6 +++---
src/i18n/it.po | 6 +++---
src/i18n/strings.ts | 24 ++++++++++++------------
src/i18n/taler-wallet-webex.pot | 6 +++---
src/webex/pages/popup.tsx | 6 +++---
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/i18n/de.po b/src/i18n/de.po
index 9950865e..88285f7d 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -266,12 +266,12 @@ msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
#, fuzzy, c-format
msgid ""
"Started to withdraw\n"
-" %1$s from%2$s(%3$s).\n"
+" %1$s%2$sfrom%3$s(%4$s).\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: src/webex/pages/popup.tsx:368
#, fuzzy, c-format
-msgid "Merchant%1$soffered contract%2$s.\n"
+msgid "Merchant%1$soffered%2$scontract%3$s.\n"
msgstr ""
"%1$s\n"
" möchte einen Vertrag über %2$s\n"
@@ -286,7 +286,7 @@ msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#, fuzzy, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
-" (%3$s)\n"
+"%3$s(%4$s)\n"
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: src/webex/pages/popup.tsx:399
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 117f00b4..6a5854d1 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -266,12 +266,12 @@ msgstr ""
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s from%2$s(%3$s).\n"
+" %1$s%2$sfrom%3$s(%4$s).\n"
msgstr ""
#: src/webex/pages/popup.tsx:368
#, c-format
-msgid "Merchant%1$soffered contract%2$s.\n"
+msgid "Merchant%1$soffered%2$scontract%3$s.\n"
msgstr ""
#: src/webex/pages/popup.tsx:379
@@ -283,7 +283,7 @@ msgstr ""
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
-" (%3$s)\n"
+"%3$s(%4$s)\n"
msgstr ""
#: src/webex/pages/popup.tsx:399
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index fe9f3902..2c896536 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -266,12 +266,12 @@ msgstr ""
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s from%2$s(%3$s).\n"
+" %1$s%2$sfrom%3$s(%4$s).\n"
msgstr ""
#: src/webex/pages/popup.tsx:368
#, c-format
-msgid "Merchant%1$soffered contract%2$s.\n"
+msgid "Merchant%1$soffered%2$scontract%3$s.\n"
msgstr ""
#: src/webex/pages/popup.tsx:379
@@ -283,7 +283,7 @@ msgstr ""
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
-" (%3$s)\n"
+"%3$s(%4$s)\n"
msgstr ""
#: src/webex/pages/popup.tsx:399
diff --git a/src/i18n/it.po b/src/i18n/it.po
index fe9f3902..2c896536 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -266,12 +266,12 @@ msgstr ""
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s from%2$s(%3$s).\n"
+" %1$s%2$sfrom%3$s(%4$s).\n"
msgstr ""
#: src/webex/pages/popup.tsx:368
#, c-format
-msgid "Merchant%1$soffered contract%2$s.\n"
+msgid "Merchant%1$soffered%2$scontract%3$s.\n"
msgstr ""
#: src/webex/pages/popup.tsx:379
@@ -283,7 +283,7 @@ msgstr ""
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
-" (%3$s)\n"
+"%3$s(%4$s)\n"
msgstr ""
#: src/webex/pages/popup.tsx:399
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 78a52bf2..ddf93e68 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -153,16 +153,16 @@ strings['de'] = {
"Bank requested reserve (%1$s) for\n %2$s.\n": [
"Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
],
- "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
"Reserve (%1$s) mit %2$s bei %3$s erzeugt"
],
- "Merchant%1$soffered contract%2$s.\n": [
+ "Merchant%1$soffered%2$scontract%3$s.\n": [
"%1$s\n möchte einen Vertrag über %2$s\n
mit Ihnen abschließen."
],
"Withdrew%1$sfrom%2$s(%3$s).\n": [
"Reserve (%1$s) mit %2$s bei %3$s erzeugt"
],
- "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
+ "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
"Reserve (%1$s) mit %2$s bei %3$s erzeugt"
],
"Merchant%1$sgave a refund over%2$s.\n": [
@@ -339,16 +339,16 @@ strings['en-US'] = {
"Bank requested reserve (%1$s) for\n %2$s.\n": [
""
],
- "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
""
],
- "Merchant%1$soffered contract%2$s.\n": [
+ "Merchant%1$soffered%2$scontract%3$s.\n": [
""
],
"Withdrew%1$sfrom%2$s(%3$s).\n": [
""
],
- "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
+ "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
""
],
"Merchant%1$sgave a refund over%2$s.\n": [
@@ -525,16 +525,16 @@ strings['fr'] = {
"Bank requested reserve (%1$s) for\n %2$s.\n": [
""
],
- "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
""
],
- "Merchant%1$soffered contract%2$s.\n": [
+ "Merchant%1$soffered%2$scontract%3$s.\n": [
""
],
"Withdrew%1$sfrom%2$s(%3$s).\n": [
""
],
- "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
+ "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
""
],
"Merchant%1$sgave a refund over%2$s.\n": [
@@ -711,16 +711,16 @@ strings['it'] = {
"Bank requested reserve (%1$s) for\n %2$s.\n": [
""
],
- "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
""
],
- "Merchant%1$soffered contract%2$s.\n": [
+ "Merchant%1$soffered%2$scontract%3$s.\n": [
""
],
"Withdrew%1$sfrom%2$s(%3$s).\n": [
""
],
- "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
+ "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
""
],
"Merchant%1$sgave a refund over%2$s.\n": [
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index fe9f3902..2c896536 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -266,12 +266,12 @@ msgstr ""
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s from%2$s(%3$s).\n"
+" %1$s%2$sfrom%3$s(%4$s).\n"
msgstr ""
#: src/webex/pages/popup.tsx:368
#, c-format
-msgid "Merchant%1$soffered contract%2$s.\n"
+msgid "Merchant%1$soffered%2$scontract%3$s.\n"
msgstr ""
#: src/webex/pages/popup.tsx:379
@@ -283,7 +283,7 @@ msgstr ""
#, c-format
msgid ""
"Paid%1$sto merchant%2$s.\n"
-" (%3$s)\n"
+"%3$s(%4$s)\n"
msgstr ""
#: src/webex/pages/popup.tsx:399
diff --git a/src/webex/pages/popup.tsx b/src/webex/pages/popup.tsx
index 9c012449..76fa79a1 100644
--- a/src/webex/pages/popup.tsx
+++ b/src/webex/pages/popup.tsx
@@ -358,7 +358,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
return (
<i18n.Translate wrap="p">
Started to withdraw
- {" "}{renderAmount(d.requestedAmount)}{" "}
+ {" "}{renderAmount(d.requestedAmount)}<span> </span>
from <span>{exchange}</span> (<span>{pub}</span>).
</i18n.Translate>
);
@@ -367,7 +367,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
const link = chrome.extension.getURL("view-contract.html");
return (
<i18n.Translate wrap="p">
- Merchant <em>{abbrev(d.merchantName, 15)}</em> offered{" "}
+ Merchant <em>{abbrev(d.merchantName, 15)}</em> offered<span> </span>
contract <a href={link}>{abbrev(d.contractTermsHash)}</a>.
</i18n.Translate>
);
@@ -389,7 +389,7 @@ function formatHistoryItem(historyItem: HistoryRecord) {
return (
<i18n.Translate wrap="p">
Paid <span>{renderAmount(d.amount)}</span> to merchant
<span>{merchantElem}</span>.
- {" "}
+ <span> </span>
(<span>{fulfillmentLinkElem}</span>)
</i18n.Translate>
);
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-wallet-webex] branch master updated: fix history rendering issue caused by i18n,
gnunet <=