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

more i18n/spacing fixes

Browse Source
This commit is contained in:
Florian Dold 2018-02-22 11:49:13 +01:00
parent 66d05038fd
commit 89815175a0
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
12 changed files with 195 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node_modules/pogen/pogen.js generated vendored
View File

@ -190,6 +190,12 @@ function processFile(sourceFile) {
var e = childNode; var e = childNode;
var s = e.getFullText(); var s = e.getFullText();
var t = s.split("\n").map(trim).join(" "); var t = s.split("\n").map(trim).join(" ");
if (s[0] === " ") {
t = " " + t;
}
if (s[s.length - 1] === " ") {
t = t + " ";
}
fragments.push(t); fragments.push(t);
} }
case ts.SyntaxKind.JsxOpeningElement: case ts.SyntaxKind.JsxOpeningElement:

1
src/i18n.tsx
View File

@ -44,6 +44,7 @@ if (!strings[lang]) {
const jed = new jedLib.Jed(strings[lang]); const jed = new jedLib.Jed(strings[lang]);
/** /**
* Convert template strings to a msgid * Convert template strings to a msgid
*/ */

12
src/i18n/de.po
View File

@ -103,7 +103,7 @@ msgstr "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließe
msgid "The total price is %1$s (plus %2$s fees)." msgid "The total price is %1$s (plus %2$s fees)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:385 #: src/webex/pages/confirm-contract.tsx:384
#, c-format #, c-format
msgid "The total price is %1$s." msgid "The total price is %1$s."
msgstr "" msgstr ""
@ -162,16 +162,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:279 #: src/webex/pages/confirm-create-reserve.tsx:279
#, c-format #, c-format
msgid "" msgid ""
"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has "
"higher, incompatible protocol version (%3$s)." "a higher, incompatible protocol version (%3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:290 #: src/webex/pages/confirm-create-reserve.tsx:290
#, c-format #, c-format
msgid "" msgid ""
"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " "The chosen exchange (protocol version %1$s might be outdated.%2$s The "
"has a lower, incompatible protocol version than your wallet (protocol version" "exchange has a lower, incompatible protocol version than your wallet "
"%3$s)." "(protocol version %3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:309 #: src/webex/pages/confirm-create-reserve.tsx:309

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

@ -103,7 +103,7 @@ msgstr ""
msgid "The total price is %1$s (plus %2$s fees)." msgid "The total price is %1$s (plus %2$s fees)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:385 #: src/webex/pages/confirm-contract.tsx:384
#, c-format #, c-format
msgid "The total price is %1$s." msgid "The total price is %1$s."
msgstr "" msgstr ""
@ -162,16 +162,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:279 #: src/webex/pages/confirm-create-reserve.tsx:279
#, c-format #, c-format
msgid "" msgid ""
"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has "
"higher, incompatible protocol version (%3$s)." "a higher, incompatible protocol version (%3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:290 #: src/webex/pages/confirm-create-reserve.tsx:290
#, c-format #, c-format
msgid "" msgid ""
"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " "The chosen exchange (protocol version %1$s might be outdated.%2$s The "
"has a lower, incompatible protocol version than your wallet (protocol version" "exchange has a lower, incompatible protocol version than your wallet "
"%3$s)." "(protocol version %3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:309 #: src/webex/pages/confirm-create-reserve.tsx:309

12
src/i18n/fr.po
View File

@ -103,7 +103,7 @@ msgstr ""
msgid "The total price is %1$s (plus %2$s fees)." msgid "The total price is %1$s (plus %2$s fees)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:385 #: src/webex/pages/confirm-contract.tsx:384
#, c-format #, c-format
msgid "The total price is %1$s." msgid "The total price is %1$s."
msgstr "" msgstr ""
@ -162,16 +162,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:279 #: src/webex/pages/confirm-create-reserve.tsx:279
#, c-format #, c-format
msgid "" msgid ""
"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has "
"higher, incompatible protocol version (%3$s)." "a higher, incompatible protocol version (%3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:290 #: src/webex/pages/confirm-create-reserve.tsx:290
#, c-format #, c-format
msgid "" msgid ""
"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " "The chosen exchange (protocol version %1$s might be outdated.%2$s The "
"has a lower, incompatible protocol version than your wallet (protocol version" "exchange has a lower, incompatible protocol version than your wallet "
"%3$s)." "(protocol version %3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:309 #: src/webex/pages/confirm-create-reserve.tsx:309

12
src/i18n/it.po
View File

@ -103,7 +103,7 @@ msgstr ""
msgid "The total price is %1$s (plus %2$s fees)." msgid "The total price is %1$s (plus %2$s fees)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:385 #: src/webex/pages/confirm-contract.tsx:384
#, c-format #, c-format
msgid "The total price is %1$s." msgid "The total price is %1$s."
msgstr "" msgstr ""
@ -162,16 +162,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:279 #: src/webex/pages/confirm-create-reserve.tsx:279
#, c-format #, c-format
msgid "" msgid ""
"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has "
"higher, incompatible protocol version (%3$s)." "a higher, incompatible protocol version (%3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:290 #: src/webex/pages/confirm-create-reserve.tsx:290
#, c-format #, c-format
msgid "" msgid ""
"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " "The chosen exchange (protocol version %1$s might be outdated.%2$s The "
"has a lower, incompatible protocol version than your wallet (protocol version" "exchange has a lower, incompatible protocol version than your wallet "
"%3$s)." "(protocol version %3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:309 #: src/webex/pages/confirm-create-reserve.tsx:309

2
src/i18n/strings.ts
View File

@ -1033,7 +1033,7 @@ strings['sv'] = {
"" ""
], ],
"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [
"" "tjänsteleverantörer plånboken"
], ],
"The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [
"tjänsteleverantörer plånboken" "tjänsteleverantörer plånboken"

16
src/i18n/sv.po
View File

@ -105,7 +105,7 @@ msgstr "Säljaren %1$serbjuder följande:"
msgid "The total price is %1$s (plus %2$s fees)." msgid "The total price is %1$s (plus %2$s fees)."
msgstr "Det totala priset är %1$s (plus %2$s avgifter).\n" msgstr "Det totala priset är %1$s (plus %2$s avgifter).\n"
#: src/webex/pages/confirm-contract.tsx:385 #: src/webex/pages/confirm-contract.tsx:384
#, fuzzy, c-format #, fuzzy, c-format
msgid "The total price is %1$s." msgid "The total price is %1$s."
msgstr "Det totala priset är %1$s." msgstr "Det totala priset är %1$s."
@ -162,18 +162,18 @@ msgid ""
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:279 #: src/webex/pages/confirm-create-reserve.tsx:279
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has "
"higher, incompatible protocol version (%3$s)." "a higher, incompatible protocol version (%3$s)."
msgstr "" msgstr "tjänsteleverantörer plånboken"
#: src/webex/pages/confirm-create-reserve.tsx:290 #: src/webex/pages/confirm-create-reserve.tsx:290
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " "The chosen exchange (protocol version %1$s might be outdated.%2$s The "
"has a lower, incompatible protocol version than your wallet (protocol version" "exchange has a lower, incompatible protocol version than your wallet "
"%3$s)." "(protocol version %3$s)."
msgstr "tjänsteleverantörer plånboken" msgstr "tjänsteleverantörer plånboken"
#: src/webex/pages/confirm-create-reserve.tsx:309 #: src/webex/pages/confirm-create-reserve.tsx:309

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

@ -103,7 +103,7 @@ msgstr ""
msgid "The total price is %1$s (plus %2$s fees)." msgid "The total price is %1$s (plus %2$s fees)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-contract.tsx:385 #: src/webex/pages/confirm-contract.tsx:384
#, c-format #, c-format
msgid "The total price is %1$s." msgid "The total price is %1$s."
msgstr "" msgstr ""
@ -162,16 +162,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:279 #: src/webex/pages/confirm-create-reserve.tsx:279
#, c-format #, c-format
msgid "" msgid ""
"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has "
"higher, incompatible protocol version (%3$s)." "a higher, incompatible protocol version (%3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:290 #: src/webex/pages/confirm-create-reserve.tsx:290
#, c-format #, c-format
msgid "" msgid ""
"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " "The chosen exchange (protocol version %1$s might be outdated.%2$s The "
"has a lower, incompatible protocol version than your wallet (protocol version" "exchange has a lower, incompatible protocol version than your wallet "
"%3$s)." "(protocol version %3$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:309 #: src/webex/pages/confirm-create-reserve.tsx:309

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

@ -370,7 +370,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
return ( return (
<div> <div>
<i18n.Translate wrap="p"> <i18n.Translate wrap="p">
The merchant <span>{merchantName} </span> offers you to purchase: The merchant{" "}<span>{merchantName}</span> offers you to purchase:
</i18n.Translate> </i18n.Translate>
<div style={{"text-align": "center"}}> <div style={{"text-align": "center"}}>
<strong>{c.summary}</strong> <strong>{c.summary}</strong>
@ -379,8 +379,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
{products} {products}
{(this.state.payStatus && this.state.payStatus.coinSelection) {(this.state.payStatus && this.state.payStatus.coinSelection)
? <i18n.Translate wrap="p"> ? <i18n.Translate wrap="p">
The total price is <span>{amount} </span> The total price is <span>{amount} </span> (plus <span>{renderAmount(this.state.payStatus.coinSelection.totalFees)}</span> fees).
(plus <span>{renderAmount(this.state.payStatus.coinSelection.totalFees)}</span> fees).
</i18n.Translate> </i18n.Translate>
: :
<i18n.Translate wrap="p">The total price is <span>{amount}</span>.</i18n.Translate> <i18n.Translate wrap="p">The total price is <span>{amount}</span>.</i18n.Translate>

6
tooling/pogen/pogen.js
View File

@ -190,6 +190,12 @@ function processFile(sourceFile) {
var e = childNode; var e = childNode;
var s = e.getFullText(); var s = e.getFullText();
var t = s.split("\n").map(trim).join(" "); var t = s.split("\n").map(trim).join(" ");
if (s[0] === " ") {
t = " " + t;
}
if (s[s.length - 1] === " ") {
t = t + " ";
}
fragments.push(t); fragments.push(t);
} }
case ts.SyntaxKind.JsxOpeningElement: case ts.SyntaxKind.JsxOpeningElement:

6
tooling/pogen/pogen.ts
View File

@ -213,6 +213,12 @@ export function processFile(sourceFile: ts.SourceFile) {
let e = childNode as ts.JsxText; let e = childNode as ts.JsxText;
let s = e.getFullText(); let s = e.getFullText();
let t = s.split("\n").map(trim).join(" "); let t = s.split("\n").map(trim).join(" ");
if (s[0] === " ") {
t = " " + t;
}
if (s[s.length - 1] === " ") {
t = t + " ";
}
fragments.push(t); fragments.push(t);
} }
case ts.SyntaxKind.JsxOpeningElement: case ts.SyntaxKind.JsxOpeningElement: